diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
index 6aa2471e..70ee864a 100644
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
@@ -57,7 +57,7 @@ import org.springframework.web.util.UriTemplate;
 
 /**
  * Factory for {@link LinkBuilderSupport} instances based on the request mapping annotated on the given controller.
- * 
+ *
  * @author Ricardo Gladwell
  * @author Oliver Gierke
  * @author Dietrich Schulten
@@ -81,7 +81,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 	/**
 	 * Configures the {@link UriComponentsContributor} to be used when building {@link Link} instances from method
 	 * invocations.
-	 * 
+	 *
 	 * @see #linkTo(Object)
 	 * @param uriComponentsContributors the uriComponentsContributors to set
 	 */
@@ -107,7 +107,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		return ControllerLinkBuilder.linkTo(controller, parameters);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.hateoas.LinkBuilderFactory#linkTo(java.lang.Class, java.util.Map)
 	 */
@@ -116,7 +116,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		return ControllerLinkBuilder.linkTo(controller, parameters);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.hateoas.MethodLinkBuilderFactory#linkTo(java.lang.Class, java.lang.reflect.Method, java.lang.Object[])
 	 */
@@ -125,7 +125,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		return ControllerLinkBuilder.linkTo(controller, method, parameters);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.hateoas.MethodLinkBuilderFactory#linkTo(java.lang.Object)
 	 */
@@ -200,11 +200,9 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		return ControllerLinkBuilder.linkTo(method, parameters);
 	}
 
-
-
 	/**
 	 * Applies the configured {@link UriComponentsContributor}s to the given {@link UriComponentsBuilder}.
-	 * 
+	 *
 	 * @param builder will never be {@literal null}.
 	 * @param invocation will never be {@literal null}.
 	 * @return
@@ -230,7 +228,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 	/**
 	 * Populates the given {@link UriComponentsBuilder} with request parameters found in the given
 	 * {@link BoundMethodParameter}.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param parameter must not be {@literal null}.
 	 */
@@ -278,7 +276,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 	/**
 	 * Custom extension of {@link AnnotatedParametersParameterAccessor} for {@link RequestParam} to allow {@literal null}
 	 * values handed in for optional request parameters.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	private static class RequestParamParameterAccessor extends AnnotatedParametersParameterAccessor {
@@ -287,7 +285,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 			super(new AnnotationAttribute(RequestParam.class));
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.hateoas.mvc.AnnotatedParametersParameterAccessor#createParameter(org.springframework.core.MethodParameter, java.lang.Object, org.springframework.hateoas.core.AnnotationAttribute)
 		 */
@@ -297,7 +295,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 
 			return new BoundMethodParameter(parameter, value, attribute) {
 
-				/* 
+				/*
 				 * (non-Javadoc)
 				 * @see org.springframework.hateoas.mvc.AnnotatedParametersParameterAccessor.BoundMethodParameter#isRequired()
 				 */
@@ -316,7 +314,7 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 			};
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.hateoas.mvc.AnnotatedParametersParameterAccessor#verifyParameterValue(org.springframework.core.MethodParameter, java.lang.Object)
 		 */