You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/07/22 00:20:10 UTC
[23/26] incubator-geode git commit: GEODE-420: Clean up of
SocketCreator code in tests. SocketCreatorFactory currently singleton,
to amend at later stage
GEODE-420: Clean up of SocketCreator code in tests.
SocketCreatorFactory currently singleton, to amend at later stage
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c5ed7a6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c5ed7a6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c5ed7a6c
Branch: refs/heads/feature/GEODE-420
Commit: c5ed7a6c3508f151a9e5b1c4212c94ef42cf1979
Parents: d8de616
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jul 13 05:59:54 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jul 21 16:15:20 2016 -0700
----------------------------------------------------------------------
.../RestAPIsQueryAndFEJUnitTest.java | 2 +-
.../gemfire/admin/GemFireMemberStatus.java | 2 +-
.../DistributedSystemHealthMonitor.java | 2 +-
.../gemfire/admin/internal/InetAddressUtil.java | 2 +-
.../admin/internal/ManagedEntityConfigImpl.java | 2 +-
.../admin/jmx/internal/AgentLauncher.java | 2 +-
.../jmx/internal/MX4JServerSocketFactory.java | 6 +-
.../client/internal/ConnectionFactoryImpl.java | 15 +-
.../cache/client/internal/ConnectionImpl.java | 4 +-
.../gemstone/gemfire/distributed/Locator.java | 2 +-
.../gemfire/distributed/LocatorLauncher.java | 2 +-
.../gemfire/distributed/ServerLauncher.java | 2 +-
.../internal/AbstractDistributionConfig.java | 9 +-
.../internal/DistributionConfig.java | 8 +-
.../internal/DistributionConfigImpl.java | 9 +-
.../internal/DistributionManager.java | 1 +
.../internal/InternalDistributedSystem.java | 1268 ++++++++---------
.../distributed/internal/InternalLocator.java | 2 +-
.../internal/LonerDistributionManager.java | 2 +-
.../distributed/internal/ServerLocation.java | 2 +-
.../distributed/internal/ServerLocator.java | 2 +-
.../distributed/internal/StartupMessage.java | 2 +
.../internal/direct/DirectChannel.java | 2 +-
.../membership/InternalDistributedMember.java | 1 +
.../membership/gms/GMSMemberFactory.java | 2 +-
.../internal/membership/gms/GMSUtil.java | 3 +-
.../internal/membership/gms/ServiceConfig.java | 2 +-
.../membership/gms/fd/GMSHealthMonitor.java | 9 +-
.../membership/gms/messenger/JGAddress.java | 2 +-
.../gms/messenger/JGroupsMessenger.java | 1 +
.../internal/tcpserver/TcpClient.java | 95 +-
.../internal/tcpserver/TcpServer.java | 198 +--
.../gemfire/internal/AbstractConfig.java | 150 +-
.../gemfire/internal/AvailablePort.java | 1 +
.../gemfire/internal/GemFireVersion.java | 1 +
.../gemfire/internal/HostStatHelper.java | 2 +
.../gemfire/internal/HostStatSampler.java | 1 +
.../gemfire/internal/MigrationClient.java | 1 +
.../gemstone/gemfire/internal/SocketCloser.java | 257 ----
.../gemfire/internal/SocketCreator.java | 1345 ------------------
.../gemfire/internal/StatArchiveWriter.java | 1 +
.../gemstone/gemfire/internal/SystemAdmin.java | 1 +
.../admin/remote/DistributionLocatorId.java | 2 +-
.../admin/remote/FetchHostResponse.java | 2 +-
.../internal/cache/CacheServerLauncher.java | 2 +-
.../internal/cache/GemFireCacheImpl.java | 1 +
.../cache/partitioned/RedundancyLogger.java | 2 +-
.../persistence/PersistentMemberPattern.java | 2 +-
.../cache/tier/sockets/AcceptorImpl.java | 42 +-
.../cache/tier/sockets/CacheClientNotifier.java | 1 +
.../cache/tier/sockets/CacheClientUpdater.java | 1 +
.../cache/tier/sockets/CacheServerStats.java | 6 +-
.../cache/xmlcache/GatewayReceiverCreation.java | 2 +-
.../gemfire/internal/net/SocketCloser.java | 257 ++++
.../gemfire/internal/net/SocketCreator.java | 1295 +++++++++++++++++
.../internal/net/SocketCreatorFactory.java | 233 +++
.../gemfire/internal/tcp/Connection.java | 4 +-
.../gemfire/internal/tcp/ConnectionTable.java | 3 +-
.../gemfire/internal/tcp/TCPConduit.java | 926 ++++++------
.../management/internal/JmxManagerAdvisee.java | 2 +-
.../management/internal/ManagementAgent.java | 94 +-
.../gemfire/management/internal/RestAgent.java | 2 +-
.../internal/beans/MemberMBeanBridge.java | 1 +
.../cli/commands/LauncherLifecycleCommands.java | 2 +-
.../memcached/GemFireMemcachedServer.java | 2 +-
.../apache/geode/redis/GeodeRedisServer.java | 2 +-
.../gemfire/cache/ConnectionPoolDUnitTest.java | 2 +
.../CacheServerSSLConnectionDUnitTest.java | 4 +
.../DistributedMulticastRegionDUnitTest.java | 259 ++--
.../AbstractLauncherIntegrationTestCase.java | 19 +-
.../distributed/DistributedSystemDUnitTest.java | 2 +-
.../distributed/HostedLocatorsDUnitTest.java | 2 +-
.../LauncherMemberMXBeanIntegrationTest.java | 2 +-
.../LocatorLauncherLocalIntegrationTest.java | 6 +-
.../LocatorLauncherRemoteIntegrationTest.java | 9 +-
.../ServerLauncherLocalIntegrationTest.java | 9 +-
.../ServerLauncherRemoteIntegrationTest.java | 9 +-
.../internal/DistributionConfigJUnitTest.java | 32 +-
.../internal/StartupMessageDataJUnitTest.java | 3 +-
.../membership/MembershipJUnitTest.java | 2 +-
.../internal/membership/NetViewJUnitTest.java | 2 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 2 +-
.../TcpServerBackwardCompatDUnitTest.java | 2 +-
.../internal/GemFireStatSamplerJUnitTest.java | 1 +
.../gemfire/internal/JSSESocketJUnitTest.java | 252 ----
.../gemfire/internal/SSLConfigJUnitTest.java | 18 -
.../internal/SimpleStatSamplerJUnitTest.java | 3 +-
.../gemfire/internal/SocketCloserJUnitTest.java | 193 ---
.../internal/SocketCloserWithWaitJUnitTest.java | 39 -
.../internal/net/JSSESocketJUnitTest.java | 260 ++++
.../internal/net/SocketCloserJUnitTest.java | 194 +++
.../net/SocketCloserWithWaitJUnitTest.java | 39 +
.../net/SocketCreatorFactoryJUnitTest.java | 211 +++
.../internal/tcp/ConnectionJUnitTest.java | 4 +-
.../gemfire/test/dunit/NetworkUtils.java | 2 +-
.../internal/JUnit4DistributedTestCase.java | 4 +-
.../apache/geode/redis/RedisDistDUnitTest.java | 2 +-
.../internal/cache/wan/GatewayReceiverImpl.java | 2 +-
.../web/swagger/config/RestApiPathProvider.java | 2 +-
100 files changed, 4193 insertions(+), 3710 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 8321caf..39b8fb1 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.distributed.ServerLauncher;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.management.internal.AgentUtil;
import com.gemstone.gemfire.management.internal.ManagementConstants;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
index 1b544a8..0f1610c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.admin.ClientHealthMonitoringRegion;
import com.gemstone.gemfire.internal.admin.remote.ClientHealthStats;
import com.gemstone.gemfire.internal.cache.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
index 54e7de7..afb3335 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.Config;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.admin.AdminBridgeServer;
import com.gemstone.gemfire.internal.admin.CacheInfo;
import com.gemstone.gemfire.internal.admin.DLockInfo;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
index 43d8e44..32462f1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
index 69751e9..2a59cdd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.admin.ManagedEntityConfig;
import com.gemstone.gemfire.internal.admin.GemFireVM;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import java.io.File;
import java.net.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
index dfa9ac3..e864f73 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.admin.jmx.AgentFactory;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.PureJavaMode;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.util.IOUtils;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
index ac79657..de61095 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -19,8 +19,10 @@ package com.gemstone.gemfire.admin.jmx.internal;
import com.gemstone.gemfire.admin.DistributedSystemConfig;
import com.gemstone.gemfire.admin.internal.InetAddressUtil;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
+
import org.apache.logging.log4j.Logger;
import java.io.IOException;
@@ -83,7 +85,7 @@ implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
if (ciphers == null || ciphers.length() == 0) {
ciphers = DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
}
- this.socketCreator = SocketCreator.createNonDefaultInstance(
+ this.socketCreator = SocketCreatorFactory.createNonDefaultInstance(
useSSL, needClientAuth, protocols, ciphers, gfsecurityProps);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
index c1700d4..339300e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.cache.tier.Acceptor;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientUpdater;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.HandShake;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
import com.gemstone.gemfire.security.GemFireSecurityException;
import org.apache.logging.log4j.Logger;
@@ -94,21 +95,15 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
this.blackList = new ServerBlackList(pingInterval);
this.cancelCriterion = cancelCriterion;
this.pool = pool;
- DistributionConfig config = InternalDistributedSystem.getConnectedInstance().getConfig();
+ InternalDistributedSystem internalDistributedSystem = InternalDistributedSystem.getConnectedInstance();
if (this.usedByGateway || (this.gatewaySender != null)) {
- this.socketCreator = SocketCreator.createNonDefaultInstance(config.getGatewaySSLEnabled(),
- config.getGatewaySSLRequireAuthentication(), config.getGatewaySSLProtocols(),
- config.getGatewaySSLCiphers(), config.getGatewaySSLProperties());
+ this.socketCreator = SocketCreatorFactory.getGatewaySSLSocketCreator();
if (sender!= null && !sender.getGatewayTransportFilters().isEmpty()) {
this.socketCreator.initializeTransportFilterClientSocketFactory(sender);
}
} else {
//If configured use SSL properties for cache-server
- this.socketCreator = SocketCreator.createNonDefaultInstance(config.getServerSSLEnabled(),
- config.getServerSSLRequireAuthentication(),
- config.getServerSSLProtocols(),
- config.getServerSSLCiphers(),
- config.getServerSSLProperties());
+ this.socketCreator = SocketCreatorFactory.getServerSSLSocketCreator();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
index 6ed2912..fbd36c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -19,8 +19,6 @@ package com.gemstone.gemfire.cache.client.internal;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.NoRouteToHostException;
import java.net.Socket;
import java.net.SocketException;
import java.nio.ByteBuffer;
@@ -37,7 +35,7 @@ import com.gemstone.gemfire.cache.client.internal.ExecuteRegionFunctionSingleHop
import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.HandShake;
import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
index 8795b71..055ef27 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Properties;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 81d874d..c0ac634 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.DistributionLocator;
import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.lang.ObjectUtils;
import com.gemstone.gemfire.internal.lang.StringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index cce482a..20af203 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.distributed.internal.DefaultServerLauncherCacheProvi
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.cache.*;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerHelper;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 5eb95cb..56de76d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.distributed.SSLEnabledComponents;
import com.gemstone.gemfire.internal.AbstractConfig;
import com.gemstone.gemfire.internal.ConfigSource;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
@@ -475,10 +475,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
* This would mean one is mixing the "old" with the "new"
*/
@ConfigAttributeChecker(name = SSL_ENABLED_COMPONENTS)
- protected String checkLegacySSLWhenSSLEnabledComponentsSet(String value) {
- if (value != null && value.length() > 0) {
- String[] components = value.split(",");
- for (String component : components) {
+ protected String[] checkLegacySSLWhenSSLEnabledComponentsSet(String[] value) {
+ if (value != null && value.length > 0) {
+ for (String component : value) {
switch (component) {
case SSLEnabledComponents.ALL:
case SSLEnabledComponents.CLUSTER:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index e053844..d8eee84 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -4274,7 +4274,7 @@ public interface DistributionConfig extends Config, LogConfig {
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = SSL_ENABLED_COMPONENTS)
- String getSSLEnabledComponents();
+ String[] getSSLEnabledComponents();
/**
* Sets the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
@@ -4282,20 +4282,20 @@ public interface DistributionConfig extends Config, LogConfig {
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = SSL_ENABLED_COMPONENTS)
- void setSSLEnabledComponents(String sslEnabledComponents);
+ void setSSLEnabledComponents(String[] sslEnabledComponents);
/**
* The name of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property
* @since Geode 1.0
*/
- @ConfigAttribute(type = String.class)
+ @ConfigAttribute(type = String[].class)
String SSL_ENABLED_COMPONENTS_NAME = SSL_ENABLED_COMPONENTS;
/**
* The default ssl enabled components
* @since Geode 1.0
*/
- String DEFAULT_SSL_ENABLED_COMPONENTS = "";
+ String[] DEFAULT_SSL_ENABLED_COMPONENTS = new String[]{};
//*************** Initializers to gather all the annotations in this class ************************
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 7484fdb..38d6a81 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -22,7 +22,6 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.URL;
@@ -43,7 +42,7 @@ import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.ConfigSource;
-import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.process.ProcessLauncherContext;
import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
@@ -493,7 +492,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private String httpServiceSSLAlias = clusterSSLAlias;
- private String sslEnabledComponents = DEFAULT_SSL_ENABLED_COMPONENTS;
+ private String[] sslEnabledComponents = DEFAULT_SSL_ENABLED_COMPONENTS;
private Map<String, ConfigSource> sourceMap = Collections.synchronizedMap(new HashMap<String, ConfigSource>());
@@ -2392,12 +2391,12 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
}
@Override
- public String getSSLEnabledComponents() {
+ public String[] getSSLEnabledComponents() {
return sslEnabledComponents;
}
@Override
- public void setSSLEnabledComponents(final String sslEnabledComponents) {
+ public void setSSLEnabledComponents(final String[] sslEnabledComponents) {
this.sslEnabledComponents = sslEnabledComponents;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c5ed7a6c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index e7d8c36..a3f3166 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
import com.gemstone.gemfire.internal.logging.log4j.AlertAppender;
import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import com.gemstone.gemfire.internal.net.SocketCreator;
import com.gemstone.gemfire.internal.sequencelog.MembershipLogger;
import com.gemstone.gemfire.internal.tcp.Connection;
import com.gemstone.gemfire.internal.tcp.ConnectionTable;