GEODE-7414_2: modify init() method argument (apache#5040)

IronOnet · May 6, 2020 · 5f9800b · 5f9800b
1 parent 536910a
commit 5f9800b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java b/...integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java
@@ -216,17 +216,17 @@ public void uncaughtException(final Thread thread, final Throwable throwable) {
   }
 
   public static class MySSLParameterExtension implements SSLParameterExtension {
-    DistributionConfig config;
+    Properties properties;
 
     @Override
-    public void init(DistributionConfig config) {
-      this.config = config;
+    public void init(Properties properties) {
+      this.properties = properties;
     }
 
     @Override
     public SSLParameters modifySSLClientSocketParameters(SSLParameters parameters) {
       List<SNIServerName> serverNames = new ArrayList<>(1);
-      SNIHostName serverName = new SNIHostName(String.valueOf(config.getDistributedSystemId()));
+      SNIHostName serverName = new SNIHostName(properties.getProperty(DISTRIBUTED_SYSTEM_ID));
       serverNames.add(serverName);
       parameters.setServerNames(serverNames);
       return parameters;

diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/SSLConfig.java
@@ -338,7 +338,7 @@ public Builder setSSLParameterExtension(
         this.sslParameterExtension = null;
         return this;
       }
-      sslParameterExtension.init(ids.getConfig());
+      sslParameterExtension.init(ids.getConfig().toProperties());
       this.sslParameterExtension = sslParameterExtension;
       return this;
     }

diff --git a/geode-core/src/main/java/org/apache/geode/net/SSLParameterExtension.java b/geode-core/src/main/java/org/apache/geode/net/SSLParameterExtension.java
@@ -15,9 +15,9 @@
 
 package org.apache.geode.net;
 
-import javax.net.ssl.SSLParameters;
+import java.util.Properties;
 
-import org.apache.geode.distributed.internal.DistributionConfig;
+import javax.net.ssl.SSLParameters;
 
 /**
  * User implementation of a SSLParameter extension logic.
@@ -29,9 +29,9 @@ public interface SSLParameterExtension {
   /**
    * Initialize the SSLParameterExtension.
    *
-   * @param config the DistributionConfig
+   * @param properties the Properties
    */
-  default void init(DistributionConfig config) {}
+  default void init(Properties properties) {}
 
   default SSLParameters modifySSLClientSocketParameters(SSLParameters parameters) {
     return parameters;