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 2017/10/10 21:18:41 UTC
[geode] branch develop updated: GEODE-3802: moved Authenticator and
Authorization classes to internal packages
This is an automated email from the ASF dual-hosted git repository.
udo 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 b78c745 GEODE-3802: moved Authenticator and Authorization classes to internal packages
b78c745 is described below
commit b78c745ad9eb6d957c9f563e31252628be116749
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Tue Oct 10 14:18:27 2017 -0700
GEODE-3802: moved Authenticator and Authorization classes to internal packages
---
.../cache/tier/sockets/ClientProtocolService.java | 2 +-
.../tier/sockets/ServerConnectionFactory.java | 2 +-
.../{ => internal}/server/Authenticator.java | 2 +-
.../security/{ => internal}/server/Authorizer.java | 2 +-
.../{ => internal}/server/NoOpAuthenticator.java | 2 +-
.../{ => internal}/server/NoOpAuthorizer.java | 2 +-
.../security/{ => internal}/server/package.html | 0
...he.geode.security.internal.server.Authenticator | 1 +
.../org.apache.geode.security.server.Authenticator | 1 -
.../tier/sockets/MessageExecutionContext.java | 5 +-
.../internal/protocol/ProtobufCachePipeline.java | 2 +-
.../internal/protocol/ProtobufProtocolService.java | 2 +-
.../protobuf/ProtobufSimpleAuthenticator.java | 4 +-
.../protobuf/ProtobufSimpleAuthorizer.java | 2 +-
...e.geode.security.internal.server.Authenticator} | 0
.../protobuf/ProtobufStreamProcessorTest.java | 2 +-
.../GetAllRequestOperationHandlerJUnitTest.java | 2 +-
...egionNamesRequestOperationHandlerJUnitTest.java | 2 +-
.../GetRegionRequestOperationHandlerJUnitTest.java | 2 +-
.../GetRequestOperationHandlerJUnitTest.java | 2 +-
.../PutAllRequestOperationHandlerJUnitTest.java | 2 +-
.../PutRequestOperationHandlerJUnitTest.java | 2 +-
.../RemoveRequestOperationHandlerJUnitTest.java | 2 +-
.../internal/cache/UpdateVersionDUnitTest.java | 940 ++++++++++-----------
24 files changed, 456 insertions(+), 529 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolService.java
index 64f5365..2d7bd64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolService.java
@@ -19,7 +19,7 @@ import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.security.server.Authenticator;
+import org.apache.geode.security.internal.server.Authenticator;
/**
* Provides a convenient location for a client protocol service to be loaded into the system.
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 e550700..8c80710 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
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.security.server.Authenticator;
+import org.apache.geode.security.internal.server.Authenticator;
/**
* Creates instances of ServerConnection based on the connection mode provided.
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java b/geode-core/src/main/java/org/apache/geode/security/internal/server/Authenticator.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java
rename to geode-core/src/main/java/org/apache/geode/security/internal/server/Authenticator.java
index 7893b4b..882988c 100644
--- a/geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/security/internal/server/Authenticator.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.security.server;
+package org.apache.geode.security.internal.server;
import java.io.IOException;
import java.io.InputStream;
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/security/internal/server/Authorizer.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java
rename to geode-core/src/main/java/org/apache/geode/security/internal/server/Authorizer.java
index fea2198..13ef090 100644
--- a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/security/internal/server/Authorizer.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.security.server;
+package org.apache.geode.security.internal.server;
import org.apache.geode.security.ResourcePermission;
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java b/geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthenticator.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java
rename to geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthenticator.java
index bf435d2..d41b29d 100644
--- a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthenticator.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.security.server;
+package org.apache.geode.security.internal.server;
import java.io.IOException;
import java.io.InputStream;
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java b/geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthorizer.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java
rename to geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthorizer.java
index 1491f04..bae1c40 100644
--- a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/security/internal/server/NoOpAuthorizer.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.security.server;
+package org.apache.geode.security.internal.server;
import org.apache.geode.security.ResourcePermission;
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/package.html b/geode-core/src/main/java/org/apache/geode/security/internal/server/package.html
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/security/server/package.html
rename to geode-core/src/main/java/org/apache/geode/security/internal/server/package.html
diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.org.apache.geode.security.internal.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.org.apache.geode.security.internal.server.Authenticator
new file mode 100644
index 0000000..2cf1df0
--- /dev/null
+++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.org.apache.geode.security.internal.server.Authenticator
@@ -0,0 +1 @@
+org.apache.geode.security.internal.server.NoOpAuthenticator
diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator
deleted file mode 100644
index 4f34d2a..0000000
--- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.geode.security.server.NoOpAuthenticator
diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java b/geode-protobuf/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
index cce750c..6c540eb 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
@@ -20,10 +20,9 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.internal.protocol.protobuf.statistics.NoOpStatistics;
import org.apache.geode.internal.protocol.protobuf.statistics.ProtobufClientStatistics;
-import org.apache.geode.security.server.Authorizer;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.Authorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
@Experimental
public class MessageExecutionContext {
diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufCachePipeline.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufCachePipeline.java
index 36bb477..ab14a78 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufCachePipeline.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufCachePipeline.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.ProtobufStreamProcessor;
import org.apache.geode.internal.protocol.protobuf.statistics.ProtobufClientStatistics;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.security.server.Authenticator;
+import org.apache.geode.security.internal.server.Authenticator;
@Experimental
public final class ProtobufCachePipeline implements ClientProtocolProcessor {
diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufProtocolService.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufProtocolService.java
index 25df248..44b20c4 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufProtocolService.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/ProtobufProtocolService.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.protocol.protobuf.statistics.NoOpStatistics;
import org.apache.geode.internal.protocol.protobuf.statistics.ProtobufClientStatistics;
import org.apache.geode.internal.protocol.protobuf.statistics.ProtobufClientStatisticsImpl;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.security.server.Authenticator;
+import org.apache.geode.security.internal.server.Authenticator;
public class ProtobufProtocolService implements ClientProtocolService {
private volatile ProtobufClientStatistics statistics;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthenticator.java
index 640243b..9fd93ec 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthenticator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthenticator.java
@@ -16,10 +16,10 @@ package org.apache.geode.internal.protocol.protobuf;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.AuthenticationRequiredException;
-import org.apache.geode.security.server.Authenticator;
+import org.apache.geode.security.internal.server.Authenticator;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.security.server.Authorizer;
+import org.apache.geode.security.internal.server.Authorizer;
import java.io.EOFException;
import java.io.IOException;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthorizer.java
index 703b6a2..bfddca9 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthorizer.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSimpleAuthorizer.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.protocol.protobuf;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.security.server.Authorizer;
+import org.apache.geode.security.internal.server.Authorizer;
public class ProtobufSimpleAuthorizer implements Authorizer {
private final Object authenticatedPrincipal;
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.org.apache.geode.security.internal.server.Authenticator
similarity index 100%
rename from geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator
rename to geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.org.apache.geode.security.internal.server.Authenticator
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
index 169e64e..16c3cd9 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessorTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.statistics.NoOpProtobufStatistics;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
index 8b8a689..9bfc061 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtil
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
index a5525ee..31ac2cb 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.protocol.protobuf.statistics.NoOpProtobufStatis
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
index df2c878..3764f6e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.internal.protocol.protobuf.Result;
import org.apache.geode.internal.protocol.protobuf.statistics.NoOpProtobufStatistics;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
index 57282d3..224ab45 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtil
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
index 70f7b66..7d6cab2 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtil
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
index 81b16ce..0a0b19e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtil
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
index b5fc6b7..3d9c2d2 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufRequestUtil
import org.apache.geode.internal.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.internal.serialization.registry.exception.CodecNotRegisteredForTypeException;
-import org.apache.geode.security.server.NoOpAuthorizer;
+import org.apache.geode.security.internal.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
index 6481ad5..60fda06 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
@@ -81,11 +81,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
@Override
public final void preTearDown() throws Exception {
closeCache();
- Invoke.invokeInEveryVM(new SerializableRunnable() {
- public void run() {
- closeCache();
- }
- });
+ Invoke.invokeInEveryVM(this::closeCache);
}
@Test
@@ -100,137 +96,120 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
final String key = "key-1";
// Site 1
- Integer lnPort =
- (Integer) vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId(1));
+ Integer lnPort = (Integer) vm0.invoke(() -> this.createFirstLocatorWithDSId(1));
- vm0.invoke(() -> UpdateVersionDUnitTest.createCache(lnPort));
- vm0.invoke(() -> UpdateVersionDUnitTest.createSender("ln1", 2, false, 10, 1, false, false, null,
- true));
+ vm0.invoke(() -> this.createCache(lnPort));
+ vm0.invoke(() -> this.createSender("ln1", 2, false, 10, 1, false, false, null, true));
- vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
- vm0.invoke(() -> UpdateVersionDUnitTest.startSender("ln1"));
- vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState("ln1"));
+ vm0.invoke(() -> this.createPartitionedRegion(regionName, "ln1", 1, 1));
+ vm0.invoke(() -> this.startSender("ln1"));
+ vm0.invoke(() -> this.waitForSenderRunningState("ln1"));
// Site 2
- Integer nyPort =
- (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator(2, lnPort));
- Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver(nyPort));
-
- vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
- vm3.invoke(() -> UpdateVersionDUnitTest.createCache(nyPort));
- vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
-
- final VersionTag tag = (VersionTag) vm0
- .invoke(new SerializableCallable("Update a single entry and get its version") {
-
- @Override
- public Object call() throws CacheException {
- Cache cache = CacheFactory.getAnyInstance();
- Region region = cache.getRegion(regionName);
- assertTrue(region instanceof PartitionedRegion);
-
- region.put(key, "value-1");
- region.put(key, "value-2");
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- // Create a duplicate entry version tag from stamp with newer
- // time-stamp.
- VersionSource memberId =
- (VersionSource) cache.getDistributedSystem().getDistributedMember();
- VersionTag tag = VersionTag.create(memberId);
-
- int entryVersion = stamp.getEntryVersion() - 1;
- int dsid = stamp.getDistributedSystemId();
- long time = System.currentTimeMillis();
-
- tag.setEntryVersion(entryVersion);
- tag.setDistributedSystemId(dsid);
- tag.setVersionTimeStamp(time);
- tag.setIsRemoteForTesting();
-
- EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
-
- ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
-
- // Verify the new stamp
- entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- stamp = regionEntry.getVersionStamp();
- assertEquals(
- "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion", time,
- stamp.getVersionTimeStamp());
- assertEquals(++entryVersion, stamp.getEntryVersion());
- assertEquals(dsid, stamp.getDistributedSystemId());
-
- return stamp.asVersionTag();
- }
+ Integer nyPort = (Integer) vm2.invoke(() -> this.createFirstRemoteLocator(2, lnPort));
+ Integer nyRecPort = (Integer) vm2.invoke(() -> this.createReceiver(nyPort));
+
+ vm2.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
+ vm3.invoke(() -> this.createCache(nyPort));
+ vm3.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
+
+ final VersionTag tag =
+ (VersionTag) vm0.invoke("Update a single entry and get its version", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ Region region = cache.getRegion(regionName);
+ assertTrue(region instanceof PartitionedRegion);
+
+ region.put(key, "value-1");
+ region.put(key, "value-2");
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ // Create a duplicate entry version tag from stamp with newer
+ // time-stamp.
+ VersionSource memberId =
+ (VersionSource) cache.getDistributedSystem().getDistributedMember();
+ VersionTag versionTag = VersionTag.create(memberId);
+
+ int entryVersion = stamp.getEntryVersion() - 1;
+ int dsid = stamp.getDistributedSystemId();
+ long time = System.currentTimeMillis();
+
+ versionTag.setEntryVersion(entryVersion);
+ versionTag.setDistributedSystemId(dsid);
+ versionTag.setVersionTimeStamp(time);
+ versionTag.setIsRemoteForTesting();
+
+ EntryEventImpl event =
+ createNewEvent((PartitionedRegion) region, versionTag, entry.getKey(), "value-3");
+
+ ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+ // Verify the new stamp
+ entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ stamp = regionEntry.getVersionStamp();
+ assertEquals("Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+ time, stamp.getVersionTimeStamp());
+ assertEquals(++entryVersion, stamp.getEntryVersion());
+ assertEquals(dsid, stamp.getDistributedSystemId());
+
+ return stamp.asVersionTag();
});
- VersionTag remoteTag =
- (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
-
- @Override
- public Object call() throws Exception {
-
- Cache cache = CacheFactory.getAnyInstance();
- final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
-
- // wait for entry to be received
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- Entry<?, ?> entry = null;
- try {
- entry = region.getDataStore().getEntryLocally(0, key, false, false);
- } catch (EntryNotFoundException e) {
- // expected
- } catch (ForceReattemptException e) {
- // expected
- } catch (PRLocallyDestroyedException e) {
- throw new RuntimeException("unexpected exception", e);
- }
- if (entry != null) {
- LogWriterUtils.getLogWriter().info("found entry " + entry);
- }
- return (entry != null);
- }
-
- public String description() {
- return "Expected " + key + " to be received on remote WAN site";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- wc = new WaitCriterion() {
- public boolean done() {
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
- return regionEntry.getVersionStamp().getVersionTimeStamp() == tag
- .getVersionTimeStamp();
- }
-
- public String description() {
- return "waiting for timestamp to be updated";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- Entry entry = region.getEntry(key);
- assertTrue("entry class is wrong: " + entry, entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- return stamp.asVersionTag();
+ VersionTag remoteTag = (VersionTag) vm3.invoke("Get timestamp from remote site", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
+
+ // wait for entry to be received
+ WaitCriterion wc = new WaitCriterion() {
+ public boolean done() {
+ Entry<?, ?> entry = null;
+ try {
+ entry = region.getDataStore().getEntryLocally(0, key, false, false);
+ } catch (EntryNotFoundException | ForceReattemptException e) {
+ // expected
+ } catch (PRLocallyDestroyedException e) {
+ throw new RuntimeException("unexpected exception", e);
}
- });
+ if (entry != null) {
+ LogWriterUtils.getLogWriter().info("found entry " + entry);
+ }
+ return (entry != null);
+ }
+
+ public String description() {
+ return "Expected " + key + " to be received on remote WAN site";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ wc = new WaitCriterion() {
+ public boolean done() {
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+ return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+ }
+
+ public String description() {
+ return "waiting for timestamp to be updated";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ Entry entry = region.getEntry(key);
+ assertTrue("entry class is wrong: " + entry, entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ return stamp.asVersionTag();
+ });
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(),
remoteTag.getVersionTimeStamp());
@@ -248,125 +227,111 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
final String key = "key-1";
// Site 1
- Integer lnPort =
- (Integer) vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId(1));
+ Integer lnPort = (Integer) vm0.invoke(() -> this.createFirstLocatorWithDSId(1));
- vm0.invoke(() -> UpdateVersionDUnitTest.createCache(lnPort));
- vm0.invoke(() -> UpdateVersionDUnitTest.createSender("ln1", 2, false, 10, 1, false, false, null,
- true));
+ vm0.invoke(() -> this.createCache(lnPort));
+ vm0.invoke(() -> this.createSender("ln1", 2, false, 10, 1, false, false, null, true));
- vm0.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, "ln1"));
- vm0.invoke(() -> UpdateVersionDUnitTest.startSender("ln1"));
- vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState("ln1"));
+ vm0.invoke(() -> this.createReplicatedRegion(regionName, "ln1"));
+ vm0.invoke(() -> this.startSender("ln1"));
+ vm0.invoke(() -> this.waitForSenderRunningState("ln1"));
// Site 2
- Integer nyPort =
- (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator(2, lnPort));
- Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver(nyPort));
-
- vm2.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, ""));
- vm3.invoke(() -> UpdateVersionDUnitTest.createCache(nyPort));
- vm3.invoke(() -> UpdateVersionDUnitTest.createReplicatedRegion(regionName, ""));
-
- final VersionTag tag = (VersionTag) vm0
- .invoke(new SerializableCallable("Update a single entry and get its version") {
-
- @Override
- public Object call() throws CacheException {
- Cache cache = CacheFactory.getAnyInstance();
- Region region = cache.getRegion(regionName);
- assertTrue(region instanceof DistributedRegion);
-
- region.put(key, "value-1");
- region.put(key, "value-2");
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof NonTXEntry);
- RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- // Create a duplicate entry version tag from stamp with newer
- // time-stamp.
- VersionSource memberId =
- (VersionSource) cache.getDistributedSystem().getDistributedMember();
- VersionTag tag = VersionTag.create(memberId);
-
- int entryVersion = stamp.getEntryVersion() - 1;
- int dsid = stamp.getDistributedSystemId();
- long time = System.currentTimeMillis();
-
- tag.setEntryVersion(entryVersion);
- tag.setDistributedSystemId(dsid);
- tag.setVersionTimeStamp(time);
- tag.setIsRemoteForTesting();
-
- EntryEventImpl event =
- createNewEvent((DistributedRegion) region, tag, entry.getKey(), "value-3");
-
- ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
-
- // Verify the new stamp
- entry = region.getEntry(key);
- assertTrue(entry instanceof NonTXEntry);
- regionEntry = ((NonTXEntry) entry).getRegionEntry();
-
- stamp = regionEntry.getVersionStamp();
- assertEquals(
- "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion", time,
- stamp.getVersionTimeStamp());
- assertEquals(entryVersion + 1, stamp.getEntryVersion());
- assertEquals(dsid, stamp.getDistributedSystemId());
-
- return stamp.asVersionTag();
- }
- });
+ Integer nyPort = (Integer) vm2.invoke(() -> this.createFirstRemoteLocator(2, lnPort));
+ Integer nyRecPort = (Integer) vm2.invoke(() -> this.createReceiver(nyPort));
- VersionTag remoteTag =
- (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
-
- @Override
- public Object call() throws Exception {
-
- Cache cache = CacheFactory.getAnyInstance();
- final Region region = cache.getRegion(regionName);
-
- // wait for entry to be received
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- return (region.getEntry(key) != null);
- }
-
- public String description() {
- return "Expected key-1 to be received on remote WAN site";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- wc = new WaitCriterion() {
- public boolean done() {
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof NonTXEntry);
- RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
- return regionEntry.getVersionStamp().getVersionTimeStamp() == tag
- .getVersionTimeStamp();
- }
-
- public String description() {
- return "waiting for timestamp to be updated";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof NonTXEntry);
- RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- return stamp.asVersionTag();
- }
+ vm2.invoke(() -> this.createReplicatedRegion(regionName, ""));
+ vm3.invoke(() -> this.createCache(nyPort));
+ vm3.invoke(() -> this.createReplicatedRegion(regionName, ""));
+
+ final VersionTag tag =
+ (VersionTag) vm0.invoke("Update a single entry and get its version", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ Region region = cache.getRegion(regionName);
+ assertTrue(region instanceof DistributedRegion);
+
+ region.put(key, "value-1");
+ region.put(key, "value-2");
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof NonTXEntry);
+ RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ // Create a duplicate entry version tag from stamp with newer
+ // time-stamp.
+ VersionSource memberId =
+ (VersionSource) cache.getDistributedSystem().getDistributedMember();
+ VersionTag versionTag = VersionTag.create(memberId);
+
+ int entryVersion = stamp.getEntryVersion() - 1;
+ int dsid = stamp.getDistributedSystemId();
+ long time = System.currentTimeMillis();
+
+ versionTag.setEntryVersion(entryVersion);
+ versionTag.setDistributedSystemId(dsid);
+ versionTag.setVersionTimeStamp(time);
+ versionTag.setIsRemoteForTesting();
+
+ EntryEventImpl event =
+ createNewEvent((DistributedRegion) region, versionTag, entry.getKey(), "value-3");
+
+ ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+ // Verify the new stamp
+ entry = region.getEntry(key);
+ assertTrue(entry instanceof NonTXEntry);
+ regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+ stamp = regionEntry.getVersionStamp();
+ assertEquals("Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+ time, stamp.getVersionTimeStamp());
+ assertEquals(entryVersion + 1, stamp.getEntryVersion());
+ assertEquals(dsid, stamp.getDistributedSystemId());
+
+ return stamp.asVersionTag();
});
+ VersionTag remoteTag = (VersionTag) vm3.invoke("Get timestamp from remote site", () -> {
+
+ Cache cache = CacheFactory.getAnyInstance();
+ final Region region = cache.getRegion(regionName);
+
+ // wait for entry to be received
+ WaitCriterion wc = new WaitCriterion() {
+ public boolean done() {
+ return (region.getEntry(key) != null);
+ }
+
+ public String description() {
+ return "Expected key-1 to be received on remote WAN site";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ wc = new WaitCriterion() {
+ public boolean done() {
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof NonTXEntry);
+ RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+ return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+ }
+
+ public String description() {
+ return "waiting for timestamp to be updated";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof NonTXEntry);
+ RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ return stamp.asVersionTag();
+ });
+
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(),
remoteTag.getVersionTimeStamp());
}
@@ -381,140 +346,123 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
VM vm3 = host.getVM(3); // server2 site2
// Site 1
- Integer lnPort =
- (Integer) vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId(1));
+ Integer lnPort = vm0.invoke(() -> this.createFirstLocatorWithDSId(1));
final String key = "key-1";
- vm0.invoke(() -> UpdateVersionDUnitTest.createCache(lnPort));
- vm0.invoke(
- () -> UpdateVersionDUnitTest.createSender("ln1", 2, true, 10, 1, false, false, null, true));
+ vm0.invoke(() -> this.createCache(lnPort));
+ vm0.invoke(() -> this.createSender("ln1", 2, true, 10, 1, false, false, null, true));
- vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
- vm0.invoke(() -> UpdateVersionDUnitTest.startSender("ln1"));
- vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState("ln1"));
+ vm0.invoke(() -> this.createPartitionedRegion(regionName, "ln1", 1, 1));
+ vm0.invoke(() -> this.startSender("ln1"));
+ vm0.invoke(() -> this.waitForSenderRunningState("ln1"));
// Site 2
- Integer nyPort =
- (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator(2, lnPort));
- Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver(nyPort));
+ Integer nyPort = (Integer) vm2.invoke(() -> this.createFirstRemoteLocator(2, lnPort));
+ Integer nyRecPort = (Integer) vm2.invoke(() -> this.createReceiver(nyPort));
- vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
+ vm2.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
- vm3.invoke(() -> UpdateVersionDUnitTest.createCache(nyPort));
- vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
+ vm3.invoke(() -> this.createCache(nyPort));
+ vm3.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
- final VersionTag tag =
- (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
-
- @Override
- public Object call() throws CacheException {
- Cache cache = CacheFactory.getAnyInstance();
- Region region = cache.getRegion(regionName);
- assertTrue(region instanceof PartitionedRegion);
-
- region.put(key, "value-1");
- region.put(key, "value-2");
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- // Create a duplicate entry version tag from stamp with newer
- // time-stamp.
- VersionSource memberId =
- (VersionSource) cache.getDistributedSystem().getDistributedMember();
- VersionTag tag = VersionTag.create(memberId);
-
- int entryVersion = stamp.getEntryVersion() - 1;
- int dsid = stamp.getDistributedSystemId();
- long time = System.currentTimeMillis();
-
- tag.setEntryVersion(entryVersion);
- tag.setDistributedSystemId(dsid);
- tag.setVersionTimeStamp(time);
- tag.setIsRemoteForTesting();
-
- EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
-
- ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
-
- // Verify the new stamp
- entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- stamp = regionEntry.getVersionStamp();
- assertEquals(
- "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion", time,
- stamp.getVersionTimeStamp());
- assertEquals(++entryVersion, stamp.getEntryVersion());
- assertEquals(dsid, stamp.getDistributedSystemId());
-
- return stamp.asVersionTag();
- }
- });
+ final VersionTag tag = vm0.invoke("Put a single entry and get its version", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ Region region = cache.getRegion(regionName);
+ assertTrue(region instanceof PartitionedRegion);
+
+ region.put(key, "value-1");
+ region.put(key, "value-2");
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ // Create a duplicate entry version tag from stamp with newer
+ // time-stamp.
+ VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+ VersionTag versionTag = VersionTag.create(memberId);
+
+ int entryVersion = stamp.getEntryVersion() - 1;
+ int dsid = stamp.getDistributedSystemId();
+ long time = System.currentTimeMillis();
+
+ versionTag.setEntryVersion(entryVersion);
+ versionTag.setDistributedSystemId(dsid);
+ versionTag.setVersionTimeStamp(time);
+ versionTag.setIsRemoteForTesting();
+
+ EntryEventImpl event =
+ createNewEvent((PartitionedRegion) region, versionTag, entry.getKey(), "value-3");
+
+ ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
- VersionTag remoteTag =
- (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
-
- @Override
- public Object call() throws Exception {
-
- Cache cache = CacheFactory.getAnyInstance();
- final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
-
- // wait for entry to be received
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- Entry<?, ?> entry = null;
- try {
- entry = region.getDataStore().getEntryLocally(0, key, false, false);
- } catch (EntryNotFoundException e) {
- // expected
- } catch (ForceReattemptException e) {
- // expected
- } catch (PRLocallyDestroyedException e) {
- throw new RuntimeException("unexpected exception", e);
- }
- if (entry != null) {
- LogWriterUtils.getLogWriter().info("found entry " + entry);
- }
- return (entry != null);
- }
-
- public String description() {
- return "Expected key-1 to be received on remote WAN site";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- wc = new WaitCriterion() {
- public boolean done() {
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
- return regionEntry.getVersionStamp().getVersionTimeStamp() == tag
- .getVersionTimeStamp();
- }
-
- public String description() {
- return "waiting for timestamp to be updated";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- return stamp.asVersionTag();
+ // Verify the new stamp
+ entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ stamp = regionEntry.getVersionStamp();
+ assertEquals("Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+ time, stamp.getVersionTimeStamp());
+ assertEquals(++entryVersion, stamp.getEntryVersion());
+ assertEquals(dsid, stamp.getDistributedSystemId());
+
+ return stamp.asVersionTag();
+ });
+
+ VersionTag remoteTag = (VersionTag) vm3.invoke("Get timestamp from remote site", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
+
+ // wait for entry to be received
+ WaitCriterion wc = new WaitCriterion() {
+ public boolean done() {
+ Entry<?, ?> entry = null;
+ try {
+ entry = region.getDataStore().getEntryLocally(0, key, false, false);
+ } catch (EntryNotFoundException e) {
+ // expected
+ } catch (ForceReattemptException e) {
+ // expected
+ } catch (PRLocallyDestroyedException e) {
+ throw new RuntimeException("unexpected exception", e);
}
- });
+ if (entry != null) {
+ LogWriterUtils.getLogWriter().info("found entry " + entry);
+ }
+ return (entry != null);
+ }
+
+ public String description() {
+ return "Expected key-1 to be received on remote WAN site";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ wc = new WaitCriterion() {
+ public boolean done() {
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+ return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+ }
+
+ public String description() {
+ return "waiting for timestamp to be updated";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ return stamp.asVersionTag();
+ });
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(),
remoteTag.getVersionTimeStamp());
@@ -530,140 +478,122 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
VM vm3 = host.getVM(3); // server2 site2
// Site 1
- Integer lnPort =
- (Integer) vm0.invoke(() -> UpdateVersionDUnitTest.createFirstLocatorWithDSId(1));
+ Integer lnPort = (Integer) vm0.invoke(() -> this.createFirstLocatorWithDSId(1));
final String key = "key-1";
- vm0.invoke(() -> UpdateVersionDUnitTest.createCache(lnPort));
- vm0.invoke(() -> UpdateVersionDUnitTest.createConcurrentSender("ln1", 2, false, 10, 2, false,
- false, null, true, 2));
+ vm0.invoke(() -> this.createCache(lnPort));
+ vm0.invoke(
+ () -> this.createConcurrentSender("ln1", 2, false, 10, 2, false, false, null, true, 2));
- vm0.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "ln1", 1, 1));
- vm0.invoke(() -> UpdateVersionDUnitTest.startSender("ln1"));
- vm0.invoke(() -> UpdateVersionDUnitTest.waitForSenderRunningState("ln1"));
+ vm0.invoke(() -> this.createPartitionedRegion(regionName, "ln1", 1, 1));
+ vm0.invoke(() -> this.startSender("ln1"));
+ vm0.invoke(() -> this.waitForSenderRunningState("ln1"));
// Site 2
- Integer nyPort =
- (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createFirstRemoteLocator(2, lnPort));
- Integer nyRecPort = (Integer) vm2.invoke(() -> UpdateVersionDUnitTest.createReceiver(nyPort));
+ Integer nyPort = (Integer) vm2.invoke(() -> this.createFirstRemoteLocator(2, lnPort));
+ Integer nyRecPort = (Integer) vm2.invoke(() -> this.createReceiver(nyPort));
- vm2.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
+ vm2.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
- vm3.invoke(() -> UpdateVersionDUnitTest.createCache(nyPort));
- vm3.invoke(() -> UpdateVersionDUnitTest.createPartitionedRegion(regionName, "", 1, 1));
+ vm3.invoke(() -> this.createCache(nyPort));
+ vm3.invoke(() -> this.createPartitionedRegion(regionName, "", 1, 1));
- final VersionTag tag =
- (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
-
- @Override
- public Object call() throws CacheException {
- Cache cache = CacheFactory.getAnyInstance();
- Region region = cache.getRegion(regionName);
- assertTrue(region instanceof PartitionedRegion);
-
- region.put(key, "value-1");
- region.put(key, "value-2");
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- // Create a duplicate entry version tag from stamp with newer
- // time-stamp.
- VersionSource memberId =
- (VersionSource) cache.getDistributedSystem().getDistributedMember();
- VersionTag tag = VersionTag.create(memberId);
-
- int entryVersion = stamp.getEntryVersion() - 1;
- int dsid = stamp.getDistributedSystemId();
- long time = System.currentTimeMillis();
-
- tag.setEntryVersion(entryVersion);
- tag.setDistributedSystemId(dsid);
- tag.setVersionTimeStamp(time);
- tag.setIsRemoteForTesting();
-
- EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
-
- ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
-
- // Verify the new stamp
- entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- stamp = regionEntry.getVersionStamp();
- assertEquals(
- "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion", time,
- stamp.getVersionTimeStamp());
- assertEquals(++entryVersion, stamp.getEntryVersion());
- assertEquals(dsid, stamp.getDistributedSystemId());
-
- return stamp.asVersionTag();
- }
- });
+ final VersionTag tag = (VersionTag) vm0.invoke("Put a single entry and get its version", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ Region region = cache.getRegion(regionName);
+ assertTrue(region instanceof PartitionedRegion);
+
+ region.put(key, "value-1");
+ region.put(key, "value-2");
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ // Create a duplicate entry version tag from stamp with newer
+ // time-stamp.
+ VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+ VersionTag versionTag = VersionTag.create(memberId);
- VersionTag remoteTag =
- (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
-
- @Override
- public Object call() throws Exception {
-
- Cache cache = CacheFactory.getAnyInstance();
- final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
-
- // wait for entry to be received
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- Entry<?, ?> entry = null;
- try {
- entry = region.getDataStore().getEntryLocally(0, key, false, false);
- } catch (EntryNotFoundException e) {
- // expected
- } catch (ForceReattemptException e) {
- // expected
- } catch (PRLocallyDestroyedException e) {
- throw new RuntimeException("unexpected exception", e);
- }
- if (entry != null) {
- LogWriterUtils.getLogWriter().info("found entry " + entry);
- }
- return (entry != null);
- }
-
- public String description() {
- return "Expected key-1 to be received on remote WAN site";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- wc = new WaitCriterion() {
- public boolean done() {
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
- return regionEntry.getVersionStamp().getVersionTimeStamp() == tag
- .getVersionTimeStamp();
- }
-
- public String description() {
- return "waiting for timestamp to be updated";
- }
- };
- Wait.waitForCriterion(wc, 30000, 500, true);
-
- Entry entry = region.getEntry(key);
- assertTrue(entry instanceof EntrySnapshot);
- RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
-
- VersionStamp stamp = regionEntry.getVersionStamp();
-
- return stamp.asVersionTag();
+ int entryVersion = stamp.getEntryVersion() - 1;
+ int dsid = stamp.getDistributedSystemId();
+ long time = System.currentTimeMillis();
+
+ versionTag.setEntryVersion(entryVersion);
+ versionTag.setDistributedSystemId(dsid);
+ versionTag.setVersionTimeStamp(time);
+ versionTag.setIsRemoteForTesting();
+
+ EntryEventImpl event =
+ createNewEvent((PartitionedRegion) region, versionTag, entry.getKey(), "value-3");
+
+ ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+ // Verify the new stamp
+ entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ stamp = regionEntry.getVersionStamp();
+ assertEquals("Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+ time, stamp.getVersionTimeStamp());
+ assertEquals(++entryVersion, stamp.getEntryVersion());
+ assertEquals(dsid, stamp.getDistributedSystemId());
+
+ return stamp.asVersionTag();
+ });
+
+ VersionTag remoteTag = (VersionTag) vm3.invoke("Get timestamp from remote site", () -> {
+ Cache cache = CacheFactory.getAnyInstance();
+ final PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
+
+ // wait for entry to be received
+ WaitCriterion wc = new WaitCriterion() {
+ public boolean done() {
+ Entry<?, ?> entry = null;
+ try {
+ entry = region.getDataStore().getEntryLocally(0, key, false, false);
+ } catch (EntryNotFoundException | ForceReattemptException e) {
+ // expected
+ } catch (PRLocallyDestroyedException e) {
+ throw new RuntimeException("unexpected exception", e);
}
- });
+ if (entry != null) {
+ LogWriterUtils.getLogWriter().info("found entry " + entry);
+ }
+ return (entry != null);
+ }
+
+ public String description() {
+ return "Expected key-1 to be received on remote WAN site";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ wc = new WaitCriterion() {
+ public boolean done() {
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+ return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+ }
+
+ public String description() {
+ return "waiting for timestamp to be updated";
+ }
+ };
+ Wait.waitForCriterion(wc, 30000, 500, true);
+
+ Entry entry = region.getEntry(key);
+ assertTrue(entry instanceof EntrySnapshot);
+ RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+ VersionStamp stamp = regionEntry.getVersionStamp();
+
+ return stamp.asVersionTag();
+ });
assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(),
remoteTag.getVersionTimeStamp());
@@ -690,7 +620,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
* Helper Methods
*/
- private static void createCache(Integer locPort) {
+ private void createCache(Integer locPort) {
UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -709,7 +639,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
expectedExceptions.add(ex);
}
- private static void closeCache() {
+ private void closeCache() {
if (cache != null && !cache.isClosed()) {
for (IgnoredException expectedException : expectedExceptions) {
cache.getLogger().info(expectedException.getRemoveMessage());
@@ -721,9 +651,9 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
cache = null;
}
- public static void createSender(String dsName, int remoteDsId, boolean isParallel,
- Integer maxMemory, Integer batchSize, boolean isConflation, boolean isPersistent,
- GatewayEventFilter filter, boolean isManualStart) {
+ public void createSender(String dsName, int remoteDsId, boolean isParallel, Integer maxMemory,
+ Integer batchSize, boolean isConflation, boolean isPersistent, GatewayEventFilter filter,
+ boolean isManualStart) {
File persistentDirectory =
new File(dsName + "_disk_" + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
persistentDirectory.mkdir();
@@ -770,8 +700,8 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
}
}
- public static void createPartitionedRegion(String regionName, String senderIds,
- Integer redundantCopies, Integer totalNumBuckets) {
+ private void createPartitionedRegion(String regionName, String senderIds, Integer redundantCopies,
+ Integer totalNumBuckets) {
AttributesFactory fact = new AttributesFactory();
if (senderIds != null) {
StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
@@ -789,7 +719,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertNotNull(r);
}
- public static void createReplicatedRegion(String regionName, String senderIds) {
+ private void createReplicatedRegion(String regionName, String senderIds) {
AttributesFactory fact = new AttributesFactory();
if (senderIds != null) {
StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
@@ -804,7 +734,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertNotNull(r);
}
- public static void waitForSenderRunningState(String senderId) {
+ private void waitForSenderRunningState(String senderId) {
Set<GatewaySender> senders = cache.getGatewaySenders();
final GatewaySender sender = getGatewaySenderById(senders, senderId);
@@ -823,7 +753,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
Wait.waitForCriterion(wc, 300000, 500, true);
}
- public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
+ private Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
@@ -839,7 +769,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
return port;
}
- public static void createConcurrentSender(String dsName, int remoteDsId, boolean isParallel,
+ private void createConcurrentSender(String dsName, int remoteDsId, boolean isParallel,
Integer maxMemory, Integer batchSize, boolean isConflation, boolean isPersistent,
GatewayEventFilter filter, boolean isManualStart, int concurrencyLevel) {
File persistentDirectory =
@@ -890,7 +820,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
}
}
- public static int createReceiver(int locPort) {
+ private int createReceiver(int locPort) {
UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
@@ -912,16 +842,14 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
return port;
}
- public static void startSender(String senderId) {
+ private void startSender(String senderId) {
Set<GatewaySender> senders = cache.getGatewaySenders();
- GatewaySender sender = null;
- for (GatewaySender s : senders) {
- if (s.getId().equals(senderId)) {
- sender = s;
+ for (GatewaySender sender : senders) {
+ if (sender.getId().equals(senderId)) {
+ sender.start();
break;
}
}
- sender.start();
}
protected static class MyLocatorCallback extends LocatorDiscoveryCallbackAdapter {
@@ -981,7 +909,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
return null;
}
- public static Integer createFirstLocatorWithDSId(int dsId) {
+ private Integer createFirstLocatorWithDSId(int dsId) {
UpdateVersionDUnitTest test = new UpdateVersionDUnitTest();
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].