You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/01/12 17:38:16 UTC

[geode] branch develop updated: GEODE-4281: Move three security test classes out of production code.

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

prhomberg 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 e7b29fa  GEODE-4281: Move three security test classes out of production code.
e7b29fa is described below

commit e7b29faa1f7e6f554779fa5d38878072c9149411
Author: Patrick Rhomberg <Pu...@users.noreply.github.com>
AuthorDate: Fri Jan 12 09:38:12 2018 -0800

    GEODE-4281: Move three security test classes out of production code.
---
 .../apache/geode/security/ClientAuthzObjectModDUnitTest.java   |  3 ---
 .../org/apache/geode}/security/FilterPostAuthorization.java    | 10 +++++-----
 .../org/apache/geode}/security/FilterPreAuthorization.java     |  7 +------
 .../test/java/org/apache/geode}/security/ObjectWithAuthz.java  |  2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
index 3dd1bdb..dc90a9c 100755
--- a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
@@ -30,9 +30,6 @@ import org.apache.geode.Instantiator;
 import org.apache.geode.cache.operations.OperationContext.OperationCode;
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.security.FilterPostAuthorization;
-import org.apache.geode.internal.security.FilterPreAuthorization;
-import org.apache.geode.internal.security.ObjectWithAuthz;
 import org.apache.geode.security.generator.CredentialGenerator;
 import org.apache.geode.security.generator.DummyAuthzCredentialGenerator;
 import org.apache.geode.security.generator.DummyCredentialGenerator;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java b/geode-cq/src/test/java/org/apache/geode/security/FilterPostAuthorization.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
rename to geode-cq/src/test/java/org/apache/geode/security/FilterPostAuthorization.java
index 901efb2..efa8ae3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/FilterPostAuthorization.java
@@ -13,13 +13,12 @@
  * the License.
  */
 
-package org.apache.geode.internal.security;
+package org.apache.geode.security;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -27,8 +26,11 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.Instantiator;
 import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.*;
+import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.cache.operations.OperationContext;
 import org.apache.geode.cache.operations.OperationContext.OperationCode;
+import org.apache.geode.cache.operations.PutOperationContext;
+import org.apache.geode.cache.operations.QueryOperationContext;
 import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.internal.CqEntry;
 import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
@@ -38,8 +40,6 @@ import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.security.AccessControl;
-import org.apache.geode.security.NotAuthorizedException;
 
 /**
  * An authorization implementation for testing that checks for authorization information in
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java b/geode-cq/src/test/java/org/apache/geode/security/FilterPreAuthorization.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
rename to geode-cq/src/test/java/org/apache/geode/security/FilterPreAuthorization.java
index 8465126..70bd221 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/FilterPreAuthorization.java
@@ -13,11 +13,10 @@
  * the License.
  */
 
-package org.apache.geode.internal.security;
+package org.apache.geode.security;
 
 import java.security.Principal;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -34,10 +33,6 @@ import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.CachedDeserializable;
-import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.security.AccessControl;
-import org.apache.geode.security.NotAuthorizedException;
 
 /**
  * An authorization implementation for testing that changes a string value in pre-operation phase to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/ObjectWithAuthz.java b/geode-cq/src/test/java/org/apache/geode/security/ObjectWithAuthz.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/internal/security/ObjectWithAuthz.java
rename to geode-cq/src/test/java/org/apache/geode/security/ObjectWithAuthz.java
index 6e8c787..c0c4166 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/ObjectWithAuthz.java
+++ b/geode-cq/src/test/java/org/apache/geode/security/ObjectWithAuthz.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package org.apache.geode.internal.security;
+package org.apache.geode.security;
 
 import java.io.DataInput;
 import java.io.DataOutput;

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].