From b5ecf2df16cd9099b1d8a9c1fae8ca434ff5a5f7 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <olga.maciaszek@gmail.com>
Date: Tue, 16 Nov 2021 13:28:21 +0100
Subject: [PATCH] Fix checkstyle.

---
 .../http/EurekaServerMockApplication.java     |   3 +-
 .../zuul/filters/ServletTraceableRequest.java | 119 +++++++++---------
 .../zuul/filters/TraceProxyRequestHelper.java |   1 +
 src/checkstyle/checkstyle-suppressions.xml    |   3 +-
 4 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
index 717738bb6..b4328612a 100644
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
+++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
@@ -54,7 +54,7 @@ import static com.netflix.appinfo.InstanceInfo.DEFAULT_SECURE_PORT;
 import static org.springframework.util.Assert.isTrue;
 
 /**
- * Mocked Eureka Server
+ * Mocked Eureka Server.
  *
  * @author Daniel Lavoie
  */
@@ -95,7 +95,6 @@ public class EurekaServerMockApplication {
 
 	/**
 	 * Simulates Eureka Server own's serialization.
-	 * @return
 	 */
 	@Bean
 	public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/ServletTraceableRequest.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/ServletTraceableRequest.java
index 69ccbf40e..6e99eef52 100644
--- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/ServletTraceableRequest.java
+++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/ServletTraceableRequest.java
@@ -33,69 +33,70 @@ import org.springframework.web.util.UriUtils;
 
 /**
  * @author Alexander Kogut
- */	
+ */
 public class ServletTraceableRequest implements TraceableRequest {
 
-		private HttpServletRequest request;
+	private HttpServletRequest request;
 
-		ServletTraceableRequest(HttpServletRequest request) {
-			this.request = request;
+	ServletTraceableRequest(HttpServletRequest request) {
+		this.request = request;
+	}
+
+	@Override
+	public String getMethod() {
+		return request.getMethod();
+	}
+
+	@Override
+	public URI getUri() {
+		String queryString = request.getQueryString();
+		if (!StringUtils.hasText(queryString)) {
+			return URI.create(request.getRequestURL().toString());
 		}
-
-		@Override
-		public String getMethod() {
-			return request.getMethod();
+		try {
+			StringBuffer urlBuffer = appendQueryString(queryString);
+			return new URI(urlBuffer.toString());
 		}
-
-		@Override
-		public URI getUri() {
-			String queryString = request.getQueryString();
-			if (!StringUtils.hasText(queryString)) {
-				return URI.create(request.getRequestURL().toString());
-			}
-			try {
-				StringBuffer urlBuffer = appendQueryString(queryString);
-				return new URI(urlBuffer.toString());
-			}
-			catch (URISyntaxException ex) {
-				String encoded = UriUtils.encode(queryString, StandardCharsets.UTF_8);
-				StringBuffer urlBuffer = appendQueryString(encoded);
-				return URI.create(urlBuffer.toString());
-			}
-		}
-
-		private StringBuffer appendQueryString(String queryString) {
-			StringBuffer urlBuffer = request.getRequestURL();
-			urlBuffer.append("?");
-			urlBuffer.append(queryString);
-			return urlBuffer;
-		}
-
-		@Override
-		public Map<String, List<String>> getHeaders() {
-			return extractHeaders();
-		}
-
-		@Override
-		public String getRemoteAddress() {
-			return request.getRemoteAddr();
-		}
-
-		private Map<String, List<String>> extractHeaders() {
-			Map<String, List<String>> headers = new LinkedHashMap<>();
-			Enumeration<String> names = request.getHeaderNames();
-			while (names.hasMoreElements()) {
-				String name = names.nextElement();
-				headers.put(name, toList(request.getHeaders(name)));
-			}
-			return headers;
-		}
-
-		private List<String> toList(Enumeration<String> enumeration) {
-			List<String> list = new ArrayList<>();
-			while (enumeration.hasMoreElements()) {
-				list.add(enumeration.nextElement());
-			}
-			return list;
+		catch (URISyntaxException ex) {
+			String encoded = UriUtils.encode(queryString, StandardCharsets.UTF_8);
+			StringBuffer urlBuffer = appendQueryString(encoded);
+			return URI.create(urlBuffer.toString());
 		}
 	}
+
+	private StringBuffer appendQueryString(String queryString) {
+		StringBuffer urlBuffer = request.getRequestURL();
+		urlBuffer.append("?");
+		urlBuffer.append(queryString);
+		return urlBuffer;
+	}
+
+	@Override
+	public Map<String, List<String>> getHeaders() {
+		return extractHeaders();
+	}
+
+	@Override
+	public String getRemoteAddress() {
+		return request.getRemoteAddr();
+	}
+
+	private Map<String, List<String>> extractHeaders() {
+		Map<String, List<String>> headers = new LinkedHashMap<>();
+		Enumeration<String> names = request.getHeaderNames();
+		while (names.hasMoreElements()) {
+			String name = names.nextElement();
+			headers.put(name, toList(request.getHeaders(name)));
+		}
+		return headers;
+	}
+
+	private List<String> toList(Enumeration<String> enumeration) {
+		List<String> list = new ArrayList<>();
+		while (enumeration.hasMoreElements()) {
+			list.add(enumeration.nextElement());
+		}
+		return list;
+	}
+
+}
diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java
index a7336161f..5349619a7 100644
--- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java
+++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java
@@ -128,4 +128,5 @@ public class TraceProxyRequestHelper extends ProxyRequestHelper {
 			info.put("body", entity.length() < 4096 ? entity : entity + "<truncated>");
 		}
 	}
+
 }
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index d22cad749..99e5d3d8b 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -43,5 +43,6 @@
 <suppress files=".*RibbonClientHttpRequestFactoryTests\.java" checks="JavadocVariable"/>
 <suppress files=".*TestAutoConfiguration\.java" checks="HideUtilityClassConstructor"/>
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
-<suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
+<suppress files=".*EurekaConfigServerBootstrapConfigurationTests\.java" checks="JavadocVariable"/>
+<suppress files=".*HystrixStreamAggregatorTests\.java" checks="JavadocVariable"/>
 </suppressions>
\ No newline at end of file