From 0144afd8bf993445b7642386dfeace877bf85720 Mon Sep 17 00:00:00 2001 From: Dave Muirhead Date: Sun, 18 Apr 2021 16:32:29 -0400 Subject: [PATCH 1/3] upgrade Geode to 1.13.2 --- pom.xml | 4 ++-- .../store/common/geode/identity/LongIDGenerator.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a7e63e2..56340cd 100644 --- a/pom.xml +++ b/pom.xml @@ -129,12 +129,12 @@ org.apache.geode geode-core - 1.9.0 + 1.13.2 org.apache.geode geode-dunit - 1.9.0 + 1.13.2 test diff --git a/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java b/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java index 9aa935e..7616719 100644 --- a/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java +++ b/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java @@ -11,7 +11,6 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; -import org.apache.logging.log4j.util.Strings; import java.util.*; /** @@ -49,7 +48,7 @@ public LongIDGenerator(final Long allocationSize) { public LongIDGenerator(final String sequenceRegionPath, final Long allocationSize) { super(); - if (Strings.isBlank(sequenceRegionPath)) + if (isBlank(sequenceRegionPath)) throw new IllegalArgumentException("sequenceRegionPath is required"); this.sequenceRegionPath = sequenceRegionPath; if (allocationSize == null) @@ -58,6 +57,10 @@ public LongIDGenerator(final String sequenceRegionPath, final Long allocationSiz this.allocationSize = allocationSize; this.allocationsByName = new HashMap<>(); } + + boolean isBlank(String string) { + return string == null || string.isEmpty(); + } /** * Return the number of identifiers that will be returned by From 9f5de94e54a76e4a1bf6737f025d001d7da114e4 Mon Sep 17 00:00:00 2001 From: Dave Muirhead Date: Sun, 18 Apr 2021 16:32:29 -0400 Subject: [PATCH 2/3] upgrade Geode to 1.13.2 Signed-off-by: Dave Muirhead --- pom.xml | 4 ++-- .../store/common/geode/identity/LongIDGenerator.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a7e63e2..56340cd 100644 --- a/pom.xml +++ b/pom.xml @@ -129,12 +129,12 @@ org.apache.geode geode-core - 1.9.0 + 1.13.2 org.apache.geode geode-dunit - 1.9.0 + 1.13.2 test diff --git a/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java b/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java index 9aa935e..7616719 100644 --- a/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java +++ b/src/main/java/io/vlingo/xoom/symbio/store/common/geode/identity/LongIDGenerator.java @@ -11,7 +11,6 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; -import org.apache.logging.log4j.util.Strings; import java.util.*; /** @@ -49,7 +48,7 @@ public LongIDGenerator(final Long allocationSize) { public LongIDGenerator(final String sequenceRegionPath, final Long allocationSize) { super(); - if (Strings.isBlank(sequenceRegionPath)) + if (isBlank(sequenceRegionPath)) throw new IllegalArgumentException("sequenceRegionPath is required"); this.sequenceRegionPath = sequenceRegionPath; if (allocationSize == null) @@ -58,6 +57,10 @@ public LongIDGenerator(final String sequenceRegionPath, final Long allocationSiz this.allocationSize = allocationSize; this.allocationsByName = new HashMap<>(); } + + boolean isBlank(String string) { + return string == null || string.isEmpty(); + } /** * Return the number of identifiers that will be returned by From 838e8a272b3336e6210df2d0e70b5c7f30fa106e Mon Sep 17 00:00:00 2001 From: Dave Muirhead Date: Sun, 18 Apr 2021 16:41:15 -0400 Subject: [PATCH 3/3] re-enable integration tests --- .../xoom/symbio/store/object/geode/GeodeObjectStoreIT.java | 5 ----- .../xoom/symbio/store/object/geode/LongIDGeneratorIT.java | 1 - .../symbio/store/state/geode/GeodeStateStoreActorIT.java | 1 - 3 files changed, 7 deletions(-) diff --git a/src/test/java/io/vlingo/xoom/symbio/store/object/geode/GeodeObjectStoreIT.java b/src/test/java/io/vlingo/xoom/symbio/store/object/geode/GeodeObjectStoreIT.java index 758e472..e90bef0 100644 --- a/src/test/java/io/vlingo/xoom/symbio/store/object/geode/GeodeObjectStoreIT.java +++ b/src/test/java/io/vlingo/xoom/symbio/store/object/geode/GeodeObjectStoreIT.java @@ -77,7 +77,6 @@ public class GeodeObjectStoreIT { private GeodeObjectStoreDelegate storeDelegate; @Test - @Ignore public void testThatObjectStoreInsertsOneAndQueries() throws Exception { dispatcher.afterCompleting(1); final MockPersistResultInterest persistInterest = new MockPersistResultInterest(); @@ -123,7 +122,6 @@ public void testThatObjectStoreInsertsOneAndQueries() throws Exception { } @Test - @Ignore public void testThatObjectStoreInsertsMultipleAndQueries() throws Exception { dispatcher.afterCompleting(3); final MockPersistResultInterest persistInterest = new MockPersistResultInterest(); @@ -166,7 +164,6 @@ public void testThatObjectStoreInsertsMultipleAndQueries() throws Exception { } @Test - @Ignore public void testThatSingleEntityUpdates() throws Exception { dispatcher.afterCompleting(1); final MockPersistResultInterest persistInterest = new MockPersistResultInterest(); @@ -235,7 +232,6 @@ public void testThatSingleEntityUpdates() throws Exception { } @Test - @Ignore public void testThatMultipleEntitiesUpdate() throws Exception { dispatcher.afterCompleting(5); final MockPersistResultInterest persistInterest = new MockPersistResultInterest(); @@ -334,7 +330,6 @@ public void testThatMultipleEntitiesUpdate() throws Exception { } @Test - @Ignore public void testRedispatch() throws Exception { final AccessSafely accessDispatcher = dispatcher.afterCompleting(5); diff --git a/src/test/java/io/vlingo/xoom/symbio/store/object/geode/LongIDGeneratorIT.java b/src/test/java/io/vlingo/xoom/symbio/store/object/geode/LongIDGeneratorIT.java index cd2d5b9..5dd7024 100644 --- a/src/test/java/io/vlingo/xoom/symbio/store/object/geode/LongIDGeneratorIT.java +++ b/src/test/java/io/vlingo/xoom/symbio/store/object/geode/LongIDGeneratorIT.java @@ -35,7 +35,6 @@ * LongIDGeneratorIT */ @SuppressWarnings("unchecked") -@Ignore public class LongIDGeneratorIT { private static final Logger LOG = LoggerFactory.getLogger(LongIDGeneratorIT.class); diff --git a/src/test/java/io/vlingo/xoom/symbio/store/state/geode/GeodeStateStoreActorIT.java b/src/test/java/io/vlingo/xoom/symbio/store/state/geode/GeodeStateStoreActorIT.java index 6c10c73..f8e650e 100644 --- a/src/test/java/io/vlingo/xoom/symbio/store/state/geode/GeodeStateStoreActorIT.java +++ b/src/test/java/io/vlingo/xoom/symbio/store/state/geode/GeodeStateStoreActorIT.java @@ -56,7 +56,6 @@ /** * GemFireStateStoreTest is responsible for testing {@link GeodeStateStoreActor}. */ -@Ignore public class GeodeStateStoreActorIT { private static final Logger LOG = LoggerFactory.getLogger(GeodeStateStoreActorIT.class); private final static String StoreName = Entity1.class.getSimpleName();