From: saul.gill <saul.gill@est.tech>
Date: Fri, 10 Mar 2023 15:55:12 +0000 (+0000)
Subject: Reverted call to  ServerConnector
X-Git-Tag: 1.12.2~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=221ed88637733fa8884c655bc2e3851e34d3b56c;p=policy%2Fcommon.git

Reverted call to  ServerConnector

Version rollback in parent repo caused an error here
Constructor used had to be reverted

Issue-ID: POLICY-4474
Change-Id: Ifaee86b127aaad5f27beb2e99cd5930f97f179de
Signed-off-by: saul.gill <saul.gill@est.tech>
---

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
index d74760b6..c5af20cb 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
@@ -239,32 +239,32 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
      * @return the server connector
      */
     public ServerConnector httpsConnector() {
-        SslContextFactory.Server sslContextFactoryServer = new SslContextFactory.Server();
+        SslContextFactory sslContextFactory = new SslContextFactory.Server();
 
         String keyStore = System.getProperty(SYSTEM_KEYSTORE_PROPERTY_NAME);
         if (keyStore != null) {
-            sslContextFactoryServer.setKeyStorePath(keyStore);
+            sslContextFactory.setKeyStorePath(keyStore);
 
             String ksPassword = System.getProperty(SYSTEM_KEYSTORE_PASSWORD_PROPERTY_NAME);
             if (ksPassword != null) {
-                sslContextFactoryServer.setKeyStorePassword(ksPassword);
+                sslContextFactory.setKeyStorePassword(ksPassword);
             }
         }
 
         String trustStore = System.getProperty(SYSTEM_TRUSTSTORE_PROPERTY_NAME);
         if (trustStore != null) {
-            sslContextFactoryServer.setTrustStorePath(trustStore);
+            sslContextFactory.setTrustStorePath(trustStore);
 
             String tsPassword = System.getProperty(SYSTEM_TRUSTSTORE_PASSWORD_PROPERTY_NAME);
             if (tsPassword != null) {
-                sslContextFactoryServer.setTrustStorePassword(tsPassword);
+                sslContextFactory.setTrustStorePassword(tsPassword);
             }
         }
 
         var https = new HttpConfiguration();
         https.addCustomizer(new SecureRequestCustomizer());
 
-        return new ServerConnector(jettyServer, sslContextFactoryServer, new HttpConnectionFactory(https));
+        return new ServerConnector(jettyServer, sslContextFactory, new HttpConnectionFactory(https));
     }
 
     public ServerConnector httpConnector() {