#509 - Polishing.

Formatting and author note.

Original pull request: #519.

Author: odrotbohm

src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java

@@ -15,11 +15,11 @@
  */
 package org.springframework.hateoas.mvc;
 
+import static org.springframework.util.StringUtils.*;
+
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.Delegate;
 
-import static org.springframework.util.StringUtils.hasText;
-
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Map;
@@ -32,7 +32,7 @@
 import org.springframework.hateoas.core.DummyInvocationUtils;
 import org.springframework.hateoas.core.LinkBuilderSupport;
 import org.springframework.hateoas.core.MappingDiscoverer;
-import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.util.Assert;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -53,7 +53,7 @@
  * @author Greg Turnquist
  * @author Kevin Conaway
  * @author Andrew Naydyonock
- * @author Oliver Trosien
+ * @author Oliver Trosien
  */
 public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuilder> {
 
@@ -255,29 +255,29 @@ public String toString() {
 	}
 
 	/**
-	 * Returns a {@link UriComponentsBuilder} obtained from the current servlet mapping with
-	 * scheme tweaked in case the request contains an {@code X-Forwarded-Ssl} header, which is not (yet)
-	 * supported by the underlying {@link UriComponentsBuilder}.
+	 * Returns a {@link UriComponentsBuilder} obtained from the current servlet mapping with scheme tweaked in case the
+	 * request contains an {@code X-Forwarded-Ssl} header, which is not (yet) supported by the underlying
+	 * {@link UriComponentsBuilder}.
 	 * 
 	 * @return
 	 */
 	static UriComponentsBuilder getBuilder() {
-		
-		HttpServletRequest request = getCurrentRequest();
-		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(request));
-
-		// special case handling for X-Forwarded-Ssl:
-		// apply it, but only if X-Forwarded-Proto is unset.
-
-		String forwardedSsl = request.getHeader("X-Forwarded-Ssl");
-		ForwardedHeader forwarded = ForwardedHeader.of(request.getHeader(ForwardedHeader.NAME));
-		String proto = hasText(forwarded.getProto()) ? forwarded.getProto() : request.getHeader("X-Forwarded-Proto");
-
-		if (!hasText(proto) && hasText(forwardedSsl) && forwardedSsl.equalsIgnoreCase("on")) {
-			builder.scheme("https");
-		}
-
-		return builder;
+
+		HttpServletRequest request = getCurrentRequest();
+		UriComponentsBuilder builder = UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(request));
+
+		// special case handling for X-Forwarded-Ssl:
+		// apply it, but only if X-Forwarded-Proto is unset.
+
+		String forwardedSsl = request.getHeader("X-Forwarded-Ssl");
+		ForwardedHeader forwarded = ForwardedHeader.of(request.getHeader(ForwardedHeader.NAME));
+		String proto = hasText(forwarded.getProto()) ? forwarded.getProto() : request.getHeader("X-Forwarded-Proto");
+
+		if (!hasText(proto) && hasText(forwardedSsl) && forwardedSsl.equalsIgnoreCase("on")) {
+			builder.scheme("https");
+		}
+
+		return builder;
 	}
 
 	/**

src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java

@@ -52,6 +52,7 @@
  * @author Oemer Yildiz
  * @author Greg Turnquist
  * @author Kevin Conaway
+ * @author Oliver Trosien
  */
 public class ControllerLinkBuilderUnitTest extends TestUtils {
 
@@ -537,23 +538,23 @@ public void addsOptionalRequestParameterTemplateForMissingValue() {
 	 */
 	@Test
 	public void supportsTwoProxiesAddingXForwardedPort() {
+
 		request.addHeader("X-Forwarded-Port", "1443,8443");
 		request.addHeader("X-Forwarded-Host", "proxy1,proxy2");
 
-		Link link = linkTo(PersonControllerImpl.class).withSelfRel();
-		assertThat(link.getHref(), startsWith("http://proxy1:1443"));
+		assertThat(linkTo(PersonControllerImpl.class).withSelfRel().getHref(), startsWith("http://proxy1:1443"));
 	}
 
 	/**
 	 * @see #509
 	 */
 	@Test
 	public void resolvesAmbiguousXForwardedHeaders() {
+
 		request.addHeader("X-Forwarded-Proto", "http");
 		request.addHeader("X-Forwarded-Ssl", "on");
 
-		Link link = linkTo(PersonControllerImpl.class).withSelfRel();
-		assertThat(link.getHref(), startsWith("http://"));
+		assertThat(linkTo(PersonControllerImpl.class).withSelfRel().getHref(), startsWith("http://"));
 	}
 
 	private static UriComponents toComponents(Link link) {