From 6863cededcf1ea0f0fc66136fd7e598e045ef004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Sep 2023 11:12:19 -0600
Subject: [PATCH] Polish

---
 .../config/RestTemplateConfig.java            | 34 +++++++++++++++++--
 ...edirectSimpleClientHttpRequestFactory.java | 16 ---------
 .../ServerResponseErrorHandler.java           | 20 -----------
 .../models/FoojayQueryParams.java             | 12 +++++--
 4 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100644 src/main/java/io/sdkman/automigration/infrastructure/NoRedirectSimpleClientHttpRequestFactory.java
 delete mode 100644 src/main/java/io/sdkman/automigration/infrastructure/ServerResponseErrorHandler.java

diff --git a/src/main/java/io/sdkman/automigration/config/RestTemplateConfig.java b/src/main/java/io/sdkman/automigration/config/RestTemplateConfig.java
index 020a8ed..9e4e536 100644
--- a/src/main/java/io/sdkman/automigration/config/RestTemplateConfig.java
+++ b/src/main/java/io/sdkman/automigration/config/RestTemplateConfig.java
@@ -1,12 +1,17 @@
 package io.sdkman.automigration.config;
 
-import io.sdkman.automigration.infrastructure.NoRedirectSimpleClientHttpRequestFactory;
-import io.sdkman.automigration.infrastructure.ServerResponseErrorHandler;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
 @Configuration
 public class RestTemplateConfig {
 
@@ -17,4 +22,29 @@ public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
 			.build();
 	}
 
+	static class NoRedirectSimpleClientHttpRequestFactory extends SimpleClientHttpRequestFactory {
+
+		@Override
+		protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException {
+			super.prepareConnection(connection, httpMethod);
+			connection.setInstanceFollowRedirects(false);
+		}
+
+	}
+
+	static class ServerResponseErrorHandler extends DefaultResponseErrorHandler {
+
+		@Override
+		protected boolean hasError(int unknownStatusCode) {
+			HttpStatus.Series series = HttpStatus.Series.resolve(unknownStatusCode);
+			return series == HttpStatus.Series.SERVER_ERROR;
+		}
+
+		@Override
+		protected boolean hasError(HttpStatusCode statusCode) {
+			return statusCode.is5xxServerError();
+		}
+
+	}
+
 }
diff --git a/src/main/java/io/sdkman/automigration/infrastructure/NoRedirectSimpleClientHttpRequestFactory.java b/src/main/java/io/sdkman/automigration/infrastructure/NoRedirectSimpleClientHttpRequestFactory.java
deleted file mode 100644
index b2571d3..0000000
--- a/src/main/java/io/sdkman/automigration/infrastructure/NoRedirectSimpleClientHttpRequestFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.sdkman.automigration.infrastructure;
-
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-
-public class NoRedirectSimpleClientHttpRequestFactory extends SimpleClientHttpRequestFactory {
-
-	@Override
-	protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException {
-		super.prepareConnection(connection, httpMethod);
-		connection.setInstanceFollowRedirects(false);
-	}
-
-}
diff --git a/src/main/java/io/sdkman/automigration/infrastructure/ServerResponseErrorHandler.java b/src/main/java/io/sdkman/automigration/infrastructure/ServerResponseErrorHandler.java
deleted file mode 100644
index e934479..0000000
--- a/src/main/java/io/sdkman/automigration/infrastructure/ServerResponseErrorHandler.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.sdkman.automigration.infrastructure;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-
-public class ServerResponseErrorHandler extends DefaultResponseErrorHandler {
-
-	@Override
-	protected boolean hasError(int unknownStatusCode) {
-		HttpStatus.Series series = HttpStatus.Series.resolve(unknownStatusCode);
-		return series == HttpStatus.Series.SERVER_ERROR;
-	}
-
-	@Override
-	protected boolean hasError(HttpStatusCode statusCode) {
-		return statusCode.is5xxServerError();
-	}
-
-}
diff --git a/src/main/java/io/sdkman/automigration/models/FoojayQueryParams.java b/src/main/java/io/sdkman/automigration/models/FoojayQueryParams.java
index a9978ba..533f941 100644
--- a/src/main/java/io/sdkman/automigration/models/FoojayQueryParams.java
+++ b/src/main/java/io/sdkman/automigration/models/FoojayQueryParams.java
@@ -1,5 +1,13 @@
 package io.sdkman.automigration.models;
 
-public record FoojayQueryParams(String distribution, String version, String javaVersion, String releaseStatus,
-		String os, boolean javafxBundled, String features, VendorProperties.OS vendorOsProperties) {
+// @formatter:off
+public record FoojayQueryParams(String distribution,
+								String version,
+								String javaVersion,
+								String releaseStatus,
+								String os,
+								boolean javafxBundled,
+								String features,
+								VendorProperties.OS vendorOsProperties) {
 }
+// @formatter:on