#560 - Add extra attributes to Link and use for HAL mediatype

Adds many additional attributes defined in RFC5988 and verifies they work properly in the neutral representation of Link while also being rendered properly in the HAL module.

Additionally, some of the files had inconsistent EOL characters. This patches that as well. To see the differences WITHOUT this bit, add ?w=1 to the github page showing the delta, and whitespace differences will be filtered out.

Resolves #100,#417,#235,#240,#238,#223

Author: gregturn

src/main/java/org/springframework/hateoas/Link.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,11 @@
  * Value object to represent a list of {@link Link}s.
  * 
  * @author Oliver Gierke
+ * @author Greg Turnquist
  */
 public class Links implements Iterable<Link> {
 
-	private static final Pattern LINK_HEADER_PATTERN = Pattern.compile("(<[^>]*>;rel=\"[^\"]*\")");
+	private static final Pattern LINK_HEADER_PATTERN = Pattern.compile("(<[^>]*>(;\\w+=\"[^\"]*\")+)");
 
 	static final Links NO_LINKS = new Links(Collections.<Link> emptyList());
 

src/main/java/org/springframework/hateoas/Links.java

@@ -1,32 +1,32 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.hateoas;
-
-/**
- * Interface for components that convert a domain type into an {@link ResourceSupport}.
- * 
- * @author Oliver Gierke
- */
-public interface ResourceAssembler<T, D extends ResourceSupport> {
-
-	/**
-	 * Converts the given entity into an {@link ResourceSupport}.
-	 * 
-	 * @param entity
-	 * @return
-	 */
-	D toResource(T entity);
-}
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.hateoas;
+
+/**
+ * Interface for components that convert a domain type into an {@link ResourceSupport}.
+ * 
+ * @author Oliver Gierke
+ */
+public interface ResourceAssembler<T, D extends ResourceSupport> {
+
+	/**
+	 * Converts the given entity into an {@link ResourceSupport}.
+	 * 
+	 * @param entity
+	 * @return
+	 */
+	D toResource(T entity);
+}

src/main/java/org/springframework/hateoas/ResourceAssembler.java

@@ -151,7 +151,7 @@ public List<Link> getLinks(String rel) {
 		return relatedLinks;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */

src/main/java/org/springframework/hateoas/ResourceSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,13 +28,46 @@
  * 
  * @author Alexander Baetz
  * @author Oliver Gierke
+ * @author Greg Turnquist
  */
-@JsonIgnoreProperties(value = "rel")
+@JsonIgnoreProperties({"rel", "media"})
 abstract class LinkMixin extends Link {
 
 	private static final long serialVersionUID = 4720588561299667409L;
 
-	/* 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.Link#getHreflang()
+	 */
+	@Override
+	@JsonInclude(Include.NON_NULL)
+	public abstract String getHreflang();
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.Link#getTitle()
+	 */
+	@Override
+	@JsonInclude(Include.NON_NULL)
+	public abstract String getTitle();
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.Link#getType()
+	 */
+	@Override
+	@JsonInclude(Include.NON_NULL)
+	public abstract String getType();
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.Link#getDeprecation()
+	 */
+	@Override
+	@JsonInclude(Include.NON_NULL)
+	public abstract String getDeprecation();
+
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.hateoas.Link#isTemplate()
 	 */