GEODE-3200 Remove unused authzrequest (apache#2311)

marcoman · Aug 31, 2018 · fad877e · fad877e
1 parent 00f7603
commit fad877e
Show file tree

Hide file tree

Showing 13 changed files with 198 additions and 324 deletions.
diff --git a/...st/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/...st/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
@@ -165,7 +165,7 @@ void handleTermination(boolean timedOut) {
 
     private void setFakeRequest() {
       testMessage = new TestMessage();
-      setRequestMsg(testMessage);
+      setRequestMessage(testMessage);
     }
   }
 

diff --git a/.../src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java b/.../src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
@@ -74,7 +74,7 @@ protected void doOneMessage() {
       this.doHandshake = false;
     } else {
       this.resetTransientData();
-      doNormalMsg();
+      doNormalMessage();
     }
   }
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
@@ -50,12 +50,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
-    int noOfParts = clientMessage.getNumberOfParts();
-
     EnumInfo enumInfo = (EnumInfo) clientMessage.getPart(0).getObject();
     int enumId = clientMessage.getPart(1).getInt();
 

diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/...e-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
@@ -50,12 +50,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
-    int noOfParts = clientMessage.getNumberOfParts();
-
     PdxType type = (PdxType) clientMessage.getPart(0).getObject();
     int typeId = clientMessage.getPart(1).getInt();
 

diff --git a/.../main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java b/.../main/java/org/apache/geode/internal/cache/tier/sockets/command/GetFunctionAttribute.java
@@ -39,10 +39,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
       final SecurityService securityService, long start) throws IOException {
     serverConnection.setAsTrue(REQUIRES_RESPONSE);
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     String functionId = clientMessage.getPart(0).getString();
     if (functionId == null) {
       String message =

diff --git a/...re/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/...re/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
@@ -47,10 +47,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     int enumId = clientMessage.getPart(0).getInt();
 
     EnumInfo result;

diff --git a/...e/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/...e/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
@@ -47,10 +47,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     EnumInfo enumInfo = (EnumInfo) clientMessage.getPart(0).getObject();
 
     int enumId;

diff --git a/...ore/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/...ore/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
@@ -46,10 +46,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     Map<Integer, EnumInfo> enums;
     try {
       InternalCache cache = serverConnection.getCache();

diff --git a/...ore/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/...ore/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
@@ -46,10 +46,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     Map<Integer, PdxType> types;
     try {
       InternalCache cache = serverConnection.getCache();

diff --git a/...main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/...main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
@@ -56,10 +56,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
           serverConnection.getSocketString());
     }
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     int noOfParts = clientMessage.getNumberOfParts();
     // Assert parts
     Assert.assertTrue((noOfParts - 1) % 3 == 0);

diff --git a/...core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java b/...core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
@@ -20,8 +20,8 @@
 import static org.apache.geode.internal.i18n.LocalizedStrings.HandShake_NO_SECURITY_CREDENTIALS_ARE_PROVIDED;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -58,7 +58,7 @@ public class ServerConnectionTest {
    */
   @Rule
   public final RestoreLocaleRule restoreLocale =
-      new RestoreLocaleRule(Locale.ENGLISH, l -> StringId.setLocale(l));
+      new RestoreLocaleRule(Locale.ENGLISH, StringId::setLocale);
 
   @Mock
   private Message requestMsg;
@@ -69,27 +69,22 @@ public class ServerConnectionTest {
   @InjectMocks
   private ServerConnection serverConnection;
 
-  private AcceptorImpl acceptor;
-  private Socket socket;
   private ServerSideHandshake handshake;
-  private InternalCache cache;
-  private SecurityService securityService;
-  private CacheServerStats stats;
 
   @Before
   public void setUp() throws IOException {
-    acceptor = mock(AcceptorImpl.class);
+    AcceptorImpl acceptor = mock(AcceptorImpl.class);
 
     InetAddress inetAddress = mock(InetAddress.class);
     when(inetAddress.getHostAddress()).thenReturn("localhost");
 
-    socket = mock(Socket.class);
+    Socket socket = mock(Socket.class);
     when(socket.getInetAddress()).thenReturn(inetAddress);
 
-    cache = mock(InternalCache.class);
-    securityService = mock(SecurityService.class);
+    InternalCache cache = mock(InternalCache.class);
+    SecurityService securityService = mock(SecurityService.class);
 
-    stats = mock(CacheServerStats.class);
+    CacheServerStats stats = mock(CacheServerStats.class);
 
     handshake = mock(ServerSideHandshake.class);
     when(handshake.getEncryptor()).thenReturn(mock(Encryptor.class));
@@ -128,7 +123,7 @@ public void pre65NonSecureShouldReturnUserAuthId() {
   public void post65SecureShouldUseUniqueIdFromMessage() {
     long uniqueIdFromMessage = 23456L;
     when(handshake.getVersion()).thenReturn(Version.GFE_82);
-    serverConnection.setRequestMsg(requestMsg);
+    serverConnection.setRequestMessage(requestMsg);
 
     assertThat(serverConnection.getRequestMessage()).isSameAs(requestMsg);
     when(requestMsg.isSecureMode()).thenReturn(true);

diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java
@@ -47,10 +47,6 @@ public void cmdExecute(final Message clientMessage, final ServerConnection serve
     serverConnection.setAsTrue(REQUIRES_RESPONSE);
     serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
 
-    if (!ServerConnection.allowInternalMessagesWithoutCredentials) {
-      serverConnection.getAuthzRequest();
-    }
-
     int op = clientMessage.getPart(0).getInt();
 
     if (op < 1) {