[geode] branch feature/GEODE-5404 updated: GEODE-5405: Removed static block, renamed test class

[boglesby]

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

boglesby pushed a commit to branch feature/GEODE-5404
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-5404 by this 
push:
     new 24814d3  GEODE-5405: Removed static block, renamed test class
24814d3 is described below

commit 24814d37fca8b8fa3efe57cc885f4c0d9e3b3761
Author: Barry Oglesby <bogle...@pivotal.io>
AuthorDate: Mon Jul 9 18:03:22 2018 -0700

    GEODE-5405: Removed static block, renamed test class
---
 .../cache/query/internal/RestrictedMethodInvocationAuthorizer.java   | 5 +----
 ...DUnitTest.java => QuerySecurityDistinctQueryDistributedTest.java} | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
index 20111a4..bd28886 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizer.java
@@ -31,10 +31,7 @@ public class RestrictedMethodInvocationAuthorizer implements 
MethodInvocationAut
 
   public static final String UNAUTHORIZED_STRING = "Unauthorized access to 
method: ";
 
-  protected static final HashMap<String, Set> DEFAULT_WHITELIST;
-  static {
-    DEFAULT_WHITELIST = createWhiteList();
-  }
+  protected static final HashMap<String, Set> DEFAULT_WHITELIST = 
createWhiteList();
 
   private SecurityService securityService;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDistributedTest.java
similarity index 96%
rename from 
geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDUnitTest.java
rename to 
geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDistributedTest.java
index dadca76..3fd782a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityDistinctQueryDistributedTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.SecurityTest;
  * This test verifies client/server distinct order-by queries with integrated 
security
  */
 @Category({DistributedTest.class, SecurityTest.class})
-public class QuerySecurityDistinctQueryDUnitTest extends QuerySecurityBase {
+public class QuerySecurityDistinctQueryDistributedTest extends 
QuerySecurityBase {
 
   public RegionShortcut getRegionType() {
     return RegionShortcut.PARTITION;
@@ -60,6 +60,5 @@ public class QuerySecurityDistinctQueryDUnitTest extends 
QuerySecurityBase {
       assertThat(results).isInstanceOf(SelectResults.class);
       assertThat(((SelectResults) results).size()).isEqualTo(limit);
     });
-
   }
 }