http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java index 709308b..9e8a0b7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java @@ -76,7 +76,7 @@ public interface InternalCache extends Cache, Extensible<Cache> { FilterProfile getFilterProfile(String regionName); - Region getRegion(String path, boolean returnDestroyedRegion); + <K, V> Region<K, V> getRegion(String path, boolean returnDestroyedRegion); MemoryAllocator getOffHeapStore();
http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java index a5f0fc2..d80fe16 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java @@ -1727,7 +1727,7 @@ public class CacheCreation implements InternalCache { } @Override - public Region getRegion(final String path, final boolean returnDestroyedRegion) { + public <K, V> Region<K, V> getRegion(final String path, final boolean returnDestroyedRegion) { throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); } http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java index d6a1efa..b217442 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java @@ -1278,16 +1278,15 @@ public class MemberMBeanBridge { } /** - * * @return root region names */ public String[] getRootRegionNames() { - Set<LocalRegion> listOfRootRegions = cache.rootRegions(); + Set<Region<?, ?>> listOfRootRegions = cache.rootRegions(); if (listOfRootRegions != null && listOfRootRegions.size() > 0) { String[] regionStr = new String[listOfRootRegions.size()]; int j = 0; - for (LocalRegion rg : listOfRootRegions) { - regionStr[j] = rg.getFullPath(); + for (Region region : listOfRootRegions) { + regionStr[j] = region.getFullPath(); j++; } return regionStr; http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java index 54d9e50..95b297c 100644 --- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java @@ -3902,7 +3902,7 @@ public class TXJUnitTest { public void testCollections() throws CacheException { Region reg1 = this.region; - checkSubRegionCollecection(reg1); + checkSubRegionCollection(reg1); { Collection nonTxKeys = reg1.keySet(); @@ -4106,7 +4106,7 @@ public class TXJUnitTest { /** * @param reg1 */ - protected void checkSubRegionCollecection(Region reg1) { + protected void checkSubRegionCollection(Region reg1) { AttributesFactory af = new AttributesFactory(); af.setScope(Scope.DISTRIBUTED_NO_ACK); Region sub1 = this.region.createSubregion("collectionSub1", af.create()); http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java b/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java index 987f22f..78942e3 100644 --- a/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java @@ -14,30 +14,44 @@ */ package org.apache.geode; -import org.apache.geode.cache.*; -import org.apache.geode.cache.util.CacheListenerAdapter; -import org.apache.geode.distributed.DistributedSystem; -import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.internal.cache.GemFireCacheImpl; +import static org.apache.geode.distributed.ConfigurationProperties.*; + +import java.util.Properties; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; -import java.util.Properties; - -import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.AttributesMutator; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.TransactionEvent; +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.cache.util.CacheListenerAdapter; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.cache.GemFireCacheImpl; /** * Extracted from TXWriterJUnitTest to share with TXWriterOOMEJUnitTest. - * */ @SuppressWarnings("deprecation") public class TXWriterTestCase { - protected int cbCount; - protected int failedCommits = 0; - protected int afterCommits = 0; - protected int afterRollbacks = 0; + int cbCount; + int failedCommits = 0; + int afterCommits = 0; + int afterRollbacks = 0; protected GemFireCacheImpl cache; protected CacheTransactionManager txMgr; @@ -47,7 +61,7 @@ public class TXWriterTestCase { Properties p = new Properties(); p.setProperty(MCAST_PORT, "0"); // loner this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem.connect(p)); - AttributesFactory<?, ?> af = new AttributesFactory<String, String>(); + AttributesFactory<String, String> af = new AttributesFactory<>(); af.setScope(Scope.DISTRIBUTED_NO_ACK); af.setIndexMaintenanceSynchronous(true); this.region = this.cache.createRegion("TXTest", af.create()); @@ -79,8 +93,8 @@ public class TXWriterTestCase { public void tearDown() { try { if (this.txMgr != null) { - ((CacheTransactionManager) this.txMgr).setWriter(null); - ((CacheTransactionManager) this.txMgr).setListener(null); + this.txMgr.setWriter(null); + this.txMgr.setListener(null); } } finally { closeCache(); @@ -95,79 +109,96 @@ public class TXWriterTestCase { } } - protected void installCacheListenerAndWriter() { + void installCacheListenerAndWriter() { AttributesMutator<String, String> mutator = this.region.getAttributesMutator(); mutator.setCacheListener(new CacheListenerAdapter<String, String>() { + @Override public void close() { cbCount++; } + @Override public void afterCreate(EntryEvent<String, String> event) { cbCount++; } + @Override public void afterUpdate(EntryEvent<String, String> event) { cbCount++; } + @Override public void afterInvalidate(EntryEvent<String, String> event) { cbCount++; } + @Override public void afterDestroy(EntryEvent<String, String> event) { cbCount++; } + @Override public void afterRegionInvalidate(RegionEvent<String, String> event) { cbCount++; } + @Override public void afterRegionDestroy(RegionEvent<String, String> event) { cbCount++; } }); mutator.setCacheWriter(new CacheWriter<String, String>() { + @Override public void close() { cbCount++; } + @Override public void beforeUpdate(EntryEvent<String, String> event) throws CacheWriterException { cbCount++; } + @Override public void beforeCreate(EntryEvent<String, String> event) throws CacheWriterException { cbCount++; } + @Override public void beforeDestroy(EntryEvent<String, String> event) throws CacheWriterException { cbCount++; } + @Override public void beforeRegionDestroy(RegionEvent<String, String> event) throws CacheWriterException { cbCount++; } + @Override public void beforeRegionClear(RegionEvent<String, String> event) throws CacheWriterException { cbCount++; } }); } - protected void installTransactionListener() { - ((CacheTransactionManager) this.txMgr).setListener(new TransactionListener() { + void installTransactionListener() { + this.txMgr.setListener(new TransactionListener() { + @Override public void afterFailedCommit(TransactionEvent event) { failedCommits++; } + @Override public void afterCommit(TransactionEvent event) { afterCommits++; } + @Override public void afterRollback(TransactionEvent event) { afterRollbacks++; } + @Override public void close() {} }); } http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java index 0a61b1f..408a680 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java @@ -14,6 +14,13 @@ */ package org.apache.geode.disttx; +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.junit.Assert.*; + +import java.util.Properties; + +import org.junit.experimental.categories.Category; + import org.apache.geode.TXWriterJUnitTest; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.CacheException; @@ -24,11 +31,6 @@ import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.test.junit.categories.DistributedTransactionsTest; import org.apache.geode.test.junit.categories.IntegrationTest; -import org.junit.experimental.categories.Category; - -import java.util.Properties; - -import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; /** * Same tests as that of {@link TXWriterJUnitTest} after setting "distributed-transactions" property @@ -43,13 +45,17 @@ public class DistTXWriterJUnitTest extends TXWriterJUnitTest { Properties p = new Properties(); p.setProperty(MCAST_PORT, "0"); // loner p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true"); + this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem.connect(p)); - AttributesFactory<?, ?> af = new AttributesFactory<String, String>(); + + AttributesFactory<String, String> af = new AttributesFactory<>(); af.setScope(Scope.DISTRIBUTED_NO_ACK); af.setIndexMaintenanceSynchronous(true); + this.region = this.cache.createRegion("TXTest", af.create()); this.txMgr = this.cache.getCacheTransactionManager(); - assert (this.txMgr.isDistributed()); + + assertTrue(this.txMgr.isDistributed()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java index b99d3fd..66eb2f7 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java @@ -14,21 +14,23 @@ */ package org.apache.geode.disttx; +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.junit.Assert.assertTrue; + +import java.util.Properties; + +import org.junit.experimental.categories.Category; + import org.apache.geode.TXWriterOOMEJUnitTest; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.CacheException; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Scope; -import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.ConfigurationProperties; +import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.test.junit.categories.DistributedTransactionsTest; import org.apache.geode.test.junit.categories.IntegrationTest; -import org.junit.experimental.categories.Category; - -import java.util.Properties; - -import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; /** * Same tests as that of {@link TXWriterOOMEJUnitTest} after setting "distributed-transactions" @@ -37,19 +39,22 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; @Category({IntegrationTest.class, DistributedTransactionsTest.class}) public class DistTXWriterOOMEJUnitTest extends TXWriterOOMEJUnitTest { - public DistTXWriterOOMEJUnitTest() {} - + @Override protected void createCache() throws CacheException { Properties p = new Properties(); p.setProperty(MCAST_PORT, "0"); // loner p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true"); + this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem.connect(p)); - AttributesFactory<?, ?> af = new AttributesFactory<String, String>(); + + AttributesFactory<String, String> af = new AttributesFactory<>(); af.setScope(Scope.DISTRIBUTED_NO_ACK); af.setIndexMaintenanceSynchronous(true); + this.region = this.cache.createRegion("TXTest", af.create()); this.txMgr = this.cache.getCacheTransactionManager(); - assert (this.txMgr.isDistributed()); + + assertTrue(this.txMgr.isDistributed()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/9abb3373/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java index d2bad64..33d55c8 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java @@ -12,9 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal.cache; import org.junit.Ignore; @@ -30,83 +27,57 @@ import org.apache.geode.cache.PartitionAttributesFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.query.QueryException; -import org.apache.geode.internal.cache.GemFireCacheImpl; -import org.apache.geode.internal.cache.InternalRegionArguments; -import org.apache.geode.internal.cache.LocalRegion; -import org.apache.geode.internal.cache.PartitionedRegion; import org.apache.geode.test.junit.categories.IntegrationTest; -/** - * - */ @Category(IntegrationTest.class) public class PRTXJUnitTest extends TXJUnitTest { - /* - * (non-Javadoc) - * - * @see org.apache.geode.TXTest#createRegion() - */ @Override protected void createRegion() throws Exception { AttributesFactory af = new AttributesFactory(); af.setConcurrencyChecksEnabled(false); // test validation expects this behavior af.setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(3).create()); - // this.region = this.cache.createRegion("PRTXJUnitTest", af.create()); + this.region = new PRWithLocalOps("PRTXJUnitTest", af.create(), null, this.cache, new InternalRegionArguments().setDestroyLockFlag(true).setRecreateFlag(false) .setSnapshotInputStream(null).setImageTarget(null)); + ((PartitionedRegion) this.region).initialize(null, null, null); ((PartitionedRegion) this.region).postCreateRegion(); + this.cache.setRegionByPath(this.region.getFullPath(), (LocalRegion) this.region); } - /* - * (non-Javadoc) - * - * @see org.apache.geode.TXTest#checkUserAttributeConflict(org.apache.geode.internal.cache. - * TXManagerImpl) - */ @Override protected void checkUserAttributeConflict(CacheTransactionManager txMgrImpl) {} - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.TXTest#checkSubRegionCollecection(org.apache.geode.internal.cache.LocalRegion) - */ @Override - protected void checkSubRegionCollecection(Region reg1) {} + protected void checkSubRegionCollection(Region reg1) {} @Override @Ignore @Test - public void testTXAndQueries() throws CacheException, QueryException { - // TODO fix this? - } + public void testTXAndQueries() throws CacheException, QueryException {} @Override @Ignore @Test - public void testCollections() throws CacheException { - // TODO make PR iterators tx aware - } + public void testCollections() throws CacheException {} @Override @Ignore @Test - public void testTxAlgebra() throws CacheException { - // TODO Auto-generated method stub - } + public void testTxAlgebra() throws CacheException {} @Test public void testTxId() { - AttributesFactory<Integer, String> af = new AttributesFactory<Integer, String>(); + AttributesFactory<String, Integer> af = new AttributesFactory<>(); af.setPartitionAttributes( new PartitionAttributesFactory<String, Integer>().setTotalNumBuckets(2).create()); + Region<String, Integer> r = this.cache.createRegion("testTxId", af.create()); r.put("one", 1); + CacheTransactionManager mgr = this.cache.getTxManager(); mgr.begin(); r.put("two", 2); @@ -116,46 +87,21 @@ public class PRTXJUnitTest extends TXJUnitTest { private static class PRWithLocalOps extends PartitionedRegion { - /** - * @param regionname - * @param ra - * @param parentRegion - * @param cache - * @param internalRegionArgs - */ - public PRWithLocalOps(String regionname, RegionAttributes ra, LocalRegion parentRegion, + PRWithLocalOps(String regionname, RegionAttributes ra, LocalRegion parentRegion, GemFireCacheImpl cache, InternalRegionArguments internalRegionArgs) { super(regionname, ra, parentRegion, cache, internalRegionArgs); } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.cache.PartitionedRegion#localDestroy(java.lang.Object, - * java.lang.Object) - */ @Override public void localDestroy(Object key, Object callbackArgument) throws EntryNotFoundException { super.destroy(key, callbackArgument); } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.cache.PartitionedRegion#localInvalidate(java.lang.Object, - * java.lang.Object) - */ @Override public void localInvalidate(Object key, Object callbackArgument) throws EntryNotFoundException { super.invalidate(key, callbackArgument); } - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.internal.cache.PartitionedRegion#localInvalidateRegion(java.lang.Object) - */ @Override public void localInvalidateRegion(Object callbackArgument) { super.invalidateRegion(callbackArgument);
