You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pi...@apache.org on 2018/01/29 22:59:16 UTC
[geode] branch develop updated: GEODE-4368: Rename server
connection classes. (#1343)
This is an automated email from the ASF dual-hosted git repository.
pivotalsarge 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 5302d88 GEODE-4368: Rename server connection classes. (#1343)
5302d88 is described below
commit 5302d88cbaa60b5390c779207c3856ea9c6c49cd
Author: Michael "Sarge" Dodge <md...@pivotal.io>
AuthorDate: Mon Jan 29 14:59:13 2018 -0800
GEODE-4368: Rename server connection classes. (#1343)
- Rename LegacyServerConnection to OriginalServerConnection.
- Rename GenericProtocolServerConnection to ProtobufServerConnection.
- Rename GenericProtocolServerConnectionTest to ProtobufServerConnectionTest.
---
.../org/apache/geode/admin/internal/CacheServerImpl.java | 12 +++++++++---
.../org/apache/geode/internal/cache/CacheServerImpl.java | 7 ++++---
...ServerConnection.java => OriginalServerConnection.java} | 4 ++--
...ServerConnection.java => ProtobufServerConnection.java} | 8 ++++----
.../cache/tier/sockets/ServerConnectionFactory.java | 11 +++++------
.../cache/tier/sockets/ServerConnectionFactoryTest.java | 4 ++--
.../internal/cache/tier/sockets/ServerConnectionTest.java | 2 +-
.../tier/sockets/OutputCapturingServerConnectionTest.java | 4 ++--
...nnectionTest.java => ProtobufServerConnectionTest.java} | 14 +++++++-------
9 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
index 76a4c44..db12bd7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
@@ -14,9 +14,15 @@
*/
package org.apache.geode.admin.internal;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import org.apache.geode.admin.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.CacheServer;
+import org.apache.geode.admin.CacheServerConfig;
+import org.apache.geode.admin.CacheVm;
+import org.apache.geode.admin.CacheVmConfig;
+import org.apache.geode.admin.ManagedEntityConfig;
+import org.apache.geode.admin.SystemMemberType;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.admin.GemFireVM;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index 3edf10a..6f7f7ee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -68,6 +68,8 @@ import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.OriginalServerConnection;
+import org.apache.geode.internal.cache.tier.sockets.ProtobufServerConnection;
import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -92,9 +94,8 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
private final SecurityService securityService;
/**
- * The server connection factory, that provides either a
- * {@link org.apache.geode.internal.cache.tier.sockets.LegacyServerConnection} or a new
- * {@link org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection}
+ * The server connection factory, that provides either a {@link OriginalServerConnection} or a new
+ * {@link ProtobufServerConnection}
*/
private final ServerConnectionFactory serverConnectionFactory = new ServerConnectionFactory();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java
rename to geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
index 47f7bd2..6044117 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/LegacyServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.security.SecurityService;
*
* Legacy is therefore a bit of a misnomer; do you have a better name?
*/
-public class LegacyServerConnection extends ServerConnection {
+public class OriginalServerConnection extends ServerConnection {
/**
* Set to false once handshake has been done
*/
@@ -51,7 +51,7 @@ public class LegacyServerConnection extends ServerConnection {
* @param acceptor
* @param securityService
*/
- public LegacyServerConnection(Socket socket, InternalCache internalCache,
+ public OriginalServerConnection(Socket socket, InternalCache internalCache,
CachedRegionHelper helper, CacheServerStats stats, int hsTimeout, int socketBufferSize,
String communicationModeStr, byte communicationMode, Acceptor acceptor,
SecurityService securityService) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
similarity index 93%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
rename to geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
index f08ac83..4bc26dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
@@ -37,17 +37,17 @@ import org.apache.geode.internal.security.SecurityService;
/**
* Holds the socket and protocol handler for the new client protocol.
*/
-public class GenericProtocolServerConnection extends ServerConnection {
+public class ProtobufServerConnection extends ServerConnection {
// The new protocol lives in a separate module and gets loaded when this class is instantiated.
private final ClientProtocolProcessor protocolProcessor;
private boolean cleanedUp;
private ClientProxyMembershipID clientProxyMembershipID;
/**
- * Creates a new <code>GenericProtocolServerConnection</code> that processes messages received
- * from an edge client over a given <code>Socket</code>.
+ * Creates a new <code>ProtobufServerConnection</code> that processes messages received from an
+ * edge client over a given <code>Socket</code>.
*/
- public GenericProtocolServerConnection(Socket socket, InternalCache c, CachedRegionHelper helper,
+ public ProtobufServerConnection(Socket socket, InternalCache c, CachedRegionHelper helper,
CacheServerStats stats, int hsTimeout, int socketBufferSize, String communicationModeStr,
byte communicationMode, Acceptor acceptor, ClientProtocolProcessor clientProtocolProcessor,
SecurityService securityService) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java
index 59d4533..c09a1f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java
@@ -61,7 +61,7 @@ public class ServerConnectionFactory {
throw new IOException("Server received unknown communication mode: " + communicationMode);
} else {
try {
- return createGenericProtocolServerConnection(socket, cache, helper, stats, hsTimeout,
+ return createProtobufServerConnection(socket, cache, helper, stats, hsTimeout,
socketBufferSize, communicationModeStr, communicationMode, acceptor, securityService);
} catch (ServiceLoadingFailureException ex) {
throw new IOException("Could not load protobuf client protocol", ex);
@@ -70,12 +70,12 @@ public class ServerConnectionFactory {
}
}
} else {
- return new LegacyServerConnection(socket, cache, helper, stats, hsTimeout, socketBufferSize,
+ return new OriginalServerConnection(socket, cache, helper, stats, hsTimeout, socketBufferSize,
communicationModeStr, communicationMode, acceptor, securityService);
}
}
- private ServerConnection createGenericProtocolServerConnection(Socket socket, InternalCache cache,
+ private ServerConnection createProtobufServerConnection(Socket socket, InternalCache cache,
CachedRegionHelper helper, CacheServerStats stats, int hsTimeout, int socketBufferSize,
String communicationModeStr, byte communicationMode, Acceptor acceptor,
SecurityService securityService) {
@@ -84,8 +84,7 @@ public class ServerConnectionFactory {
ClientProtocolProcessor processor = service.createProcessorForCache(cache, securityService);
- return new GenericProtocolServerConnection(socket, cache, helper, stats, hsTimeout,
- socketBufferSize, communicationModeStr, communicationMode, acceptor, processor,
- securityService);
+ return new ProtobufServerConnection(socket, cache, helper, stats, hsTimeout, socketBufferSize,
+ communicationModeStr, communicationMode, acceptor, processor, securityService);
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
index 74c3e7f..ac6a560 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
@@ -86,7 +86,7 @@ public class ServerConnectionFactoryTest {
for (CommunicationMode communicationMode : communicationModes) {
ServerConnection serverConnection =
serverConnectionMockedExceptForCommunicationMode(communicationMode.getModeNumber());
- assertTrue(serverConnection instanceof LegacyServerConnection);
+ assertTrue(serverConnection instanceof OriginalServerConnection);
}
}
@@ -102,7 +102,7 @@ public class ServerConnectionFactoryTest {
for (CommunicationMode communicationMode : communicationModes) {
ServerConnection serverConnection =
serverConnectionMockedExceptForCommunicationMode(communicationMode.getModeNumber());
- assertTrue(serverConnection instanceof LegacyServerConnection);
+ assertTrue(serverConnection instanceof OriginalServerConnection);
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
index b7f0e7b..373ee67 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
@@ -192,7 +192,7 @@ public class ServerConnectionTest {
}
}
- class TestServerConnection extends LegacyServerConnection {
+ class TestServerConnection extends OriginalServerConnection {
private TestMessage testMessage;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
index 929b725..1541499 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/OutputCapturingServerConnectionTest.java
@@ -74,7 +74,7 @@ public class OutputCapturingServerConnectionTest {
assertFalse(stdoutCapture.contains(unexpectedMessage));
}
- private GenericProtocolServerConnection getServerConnection(Socket socketMock,
+ private ProtobufServerConnection getServerConnection(Socket socketMock,
ClientProtocolProcessor clientProtocolProcessorMock, AcceptorImpl acceptorStub)
throws UnknownHostException {
ClientHealthMonitor clientHealthMonitorMock = mock(ClientHealthMonitor.class);
@@ -85,7 +85,7 @@ public class OutputCapturingServerConnectionTest {
when(socketMock.getRemoteSocketAddress()).thenReturn(inetSocketAddressStub);
when(socketMock.getInetAddress()).thenReturn(inetAddressStub);
- return new GenericProtocolServerConnection(socketMock, mock(InternalCache.class),
+ return new ProtobufServerConnection(socketMock, mock(InternalCache.class),
mock(CachedRegionHelper.class), mock(CacheServerStats.class), 0, 0, "",
CommunicationMode.ProtobufClientServerProtocol.getModeNumber(), acceptorStub,
clientProtocolProcessorMock, mock(SecurityService.class));
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
similarity index 92%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java
rename to geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
index 1414826..bb2e264 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnectionTest.java
@@ -43,7 +43,7 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class GenericProtocolServerConnectionTest {
+public class ProtobufServerConnectionTest {
private ClientHealthMonitor clientHealthMonitorMock;
@@ -62,10 +62,10 @@ public class GenericProtocolServerConnectionTest {
AcceptorImpl acceptorStub = mock(AcceptorImpl.class);
ClientProtocolProcessor clientProtocolProcessorMock = mock(ClientProtocolProcessor.class);
- GenericProtocolServerConnection genericProtocolServerConnection =
+ ProtobufServerConnection protobufServerConnection =
getServerConnection(socketMock, clientProtocolProcessorMock, acceptorStub);
- genericProtocolServerConnection.emergencyClose();
+ protobufServerConnection.emergencyClose();
Mockito.verify(socketMock).close();
}
@@ -108,14 +108,14 @@ public class GenericProtocolServerConnectionTest {
clientProxyMembershipIDArgumentCaptor.getValue().toString());
}
- private GenericProtocolServerConnection IOExceptionThrowingServerConnection()
+ private ProtobufServerConnection IOExceptionThrowingServerConnection()
throws IOException, IncompatibleVersionException {
ClientProtocolProcessor clientProtocolProcessor = mock(ClientProtocolProcessor.class);
doThrow(new IOException()).when(clientProtocolProcessor).processMessage(any(), any());
return getServerConnection(clientProtocolProcessor, mock(AcceptorImpl.class));
}
- private GenericProtocolServerConnection getServerConnection(Socket socketMock,
+ private ProtobufServerConnection getServerConnection(Socket socketMock,
ClientProtocolProcessor clientProtocolProcessorMock, AcceptorImpl acceptorStub)
throws UnknownHostException {
clientHealthMonitorMock = mock(ClientHealthMonitor.class);
@@ -126,13 +126,13 @@ public class GenericProtocolServerConnectionTest {
when(socketMock.getRemoteSocketAddress()).thenReturn(inetSocketAddressStub);
when(socketMock.getInetAddress()).thenReturn(inetAddressStub);
- return new GenericProtocolServerConnection(socketMock, mock(InternalCache.class),
+ return new ProtobufServerConnection(socketMock, mock(InternalCache.class),
mock(CachedRegionHelper.class), mock(CacheServerStats.class), 0, 0, "",
CommunicationMode.ProtobufClientServerProtocol.getModeNumber(), acceptorStub,
clientProtocolProcessorMock, mock(SecurityService.class));
}
- private GenericProtocolServerConnection getServerConnection(
+ private ProtobufServerConnection getServerConnection(
ClientProtocolProcessor clientProtocolProcessorMock, AcceptorImpl acceptorStub)
throws UnknownHostException {
Socket socketMock = mock(Socket.class);
--
To stop receiving notification emails like this one, please contact
pivotalsarge@apache.org.