From e0b4d7e321d1a811fc9485fb59f8b8d08ec75310 Mon Sep 17 00:00:00 2001
From: Nikita Konev <3160384+nkonev@users.noreply.github.com>
Date: Tue, 19 May 2020 22:26:29 +0300
Subject: [PATCH] make static inner classes in HttpClientProperties (#1618)

---
 .../gateway/config/HttpClientProperties.java  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
index b97d6ffa..dfc5c72c 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
@@ -276,7 +276,7 @@ public class HttpClientProperties {
 
 	}
 
-	public class Proxy {
+	public static class Proxy {
 
 		/** Hostname for proxy configuration of Netty HttpClient. */
 		private String host;
@@ -345,7 +345,7 @@ public class HttpClientProperties {
 
 	}
 
-	public class Ssl {
+	public static class Ssl {
 
 		/**
 		 * Installs the netty InsecureTrustManagerFactory. This is insecure and not
@@ -437,7 +437,7 @@ public class HttpClientProperties {
 				CertificateFactory certificateFactory = CertificateFactory
 						.getInstance("X.509");
 				ArrayList<Certificate> allCerts = new ArrayList<>();
-				for (String trustedCert : ssl.getTrustedX509Certificates()) {
+				for (String trustedCert : getTrustedX509Certificates()) {
 					try {
 						URL url = ResourceUtils.getURL(trustedCert);
 						Collection<? extends Certificate> certs = certificateFactory
@@ -459,14 +459,14 @@ public class HttpClientProperties {
 
 		public KeyManagerFactory getKeyManagerFactory() {
 			try {
-				if (ssl.getKeyStore() != null && ssl.getKeyStore().length() > 0) {
+				if (getKeyStore() != null && getKeyStore().length() > 0) {
 					KeyManagerFactory keyManagerFactory = KeyManagerFactory
 							.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-					char[] keyPassword = ssl.getKeyPassword() != null
-							? ssl.getKeyPassword().toCharArray() : null;
+					char[] keyPassword = getKeyPassword() != null
+							? getKeyPassword().toCharArray() : null;
 
-					if (keyPassword == null && ssl.getKeyStorePassword() != null) {
-						keyPassword = ssl.getKeyStorePassword().toCharArray();
+					if (keyPassword == null && getKeyStorePassword() != null) {
+						keyPassword = getKeyStorePassword().toCharArray();
 					}
 
 					keyManagerFactory.init(this.createKeyStore(), keyPassword);
@@ -483,18 +483,17 @@ public class HttpClientProperties {
 
 		public KeyStore createKeyStore() {
 			try {
-				KeyStore store = ssl.getKeyStoreProvider() != null
-						? KeyStore.getInstance(ssl.getKeyStoreType(),
-								ssl.getKeyStoreProvider())
-						: KeyStore.getInstance(ssl.getKeyStoreType());
+				KeyStore store = getKeyStoreProvider() != null
+						? KeyStore.getInstance(getKeyStoreType(), getKeyStoreProvider())
+						: KeyStore.getInstance(getKeyStoreType());
 				try {
-					URL url = ResourceUtils.getURL(ssl.getKeyStore());
-					store.load(url.openStream(), ssl.getKeyStorePassword() != null
-							? ssl.getKeyStorePassword().toCharArray() : null);
+					URL url = ResourceUtils.getURL(getKeyStore());
+					store.load(url.openStream(), getKeyStorePassword() != null
+							? getKeyStorePassword().toCharArray() : null);
 				}
 				catch (Exception e) {
 					throw new WebServerException(
-							"Could not load key store ' " + ssl.getKeyStore() + "'", e);
+							"Could not load key store ' " + getKeyStore() + "'", e);
 				}
 
 				return store;
@@ -598,7 +597,7 @@ public class HttpClientProperties {
 
 	}
 
-	public class Websocket {
+	public static class Websocket {
 
 		/** Max frame payload length. */
 		private Integer maxFramePayloadLength;