[geode] branch develop updated: GEODE-7414_2: modify init() method argument (#5040)

[mivanac]

This is an automated email from the ASF dual-hosted git repository.

mivanac pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5f9800b  GEODE-7414_2: modify init() method argument (#5040)
5f9800b is described below

commit 5f9800b291d3a11140eb5a1a972459207e07b50c
Author: Mario Ivanac <48509724+miva...@users.noreply.github.com>
AuthorDate: Wed May 6 06:28:18 2020 +0200

    GEODE-7414_2: modify init() method argument (#5040)
---
 .../geode/net/SSLSocketParameterExtensionIntegrationTest.java     | 8 ++++----
 .../src/main/java/org/apache/geode/internal/admin/SSLConfig.java  | 2 +-
 .../src/main/java/org/apache/geode/net/SSLParameterExtension.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java
index 6f84f51..e8cea3e 100644
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/net/SSLSocketParameterExtensionIntegrationTest.java
@@ -216,17 +216,17 @@ public class SSLSocketParameterExtensionIntegrationTest {
   }
 
   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
index b1e3f07..8dc9a75 100755
--- 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 class SSLConfig {
         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
index 0ed4465..3fa39b4 100644
--- 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;