You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/04 18:37:59 UTC
[44/54] [abbrv] geode git commit: fixup
fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ba9744c1
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ba9744c1
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ba9744c1
Branch: refs/heads/feature/GEODE-2632-10
Commit: ba9744c1c53bb6dccbb8debbd9e35ee9f0d3bff0
Parents: 41a9d68
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 2 19:07:57 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 3 17:06:23 2017 -0700
----------------------------------------------------------------------
.../internal/common/PeerToPeerSessionCache.java | 3 +-
.../geode/internal/cache/PartitionedRegion.java | 6 ++--
.../geode/cache30/CacheXml66DUnitTest.java | 34 +++++++++-----------
.../geode/cache30/CacheXmlGeode10DUnitTest.java | 6 ++--
.../apache/geode/cache30/CacheXmlTestCase.java | 7 ++--
.../DescribeDiskStoreFunctionJUnitTest.java | 3 +-
6 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
index 3dae196..10c13ae 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
@@ -80,7 +80,8 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
* If local cache is enabled, create the local region fronting the session region and set it as
* the operating region; otherwise, use the session region directly as the operating region.
*/
- boolean enableLocalCache = Boolean.valueOf((String)properties.get(CacheProperty.ENABLE_LOCAL_CACHE));
+ boolean enableLocalCache =
+ Boolean.valueOf((String) properties.get(CacheProperty.ENABLE_LOCAL_CACHE));
operatingRegion = enableLocalCache ? createOrRetrieveLocalRegion() : this.sessionRegion;
// Create or retrieve the statistics
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 2470f8f..eebe2c7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -3971,7 +3971,8 @@ public class PartitionedRegion extends LocalRegion
} else if (cause instanceof RegionDestroyedException) {
throw new TransactionDataRebalancedException(
LocalizedStrings.PartitionedRegion_TRANSACTIONAL_DATA_MOVED_DUE_TO_REBALANCING
- .toLocalizedString(key), cause);
+ .toLocalizedString(key),
+ cause);
} else {
// Make transaction fail so client could retry
// instead of returning null if ForceReattemptException is thrown.
@@ -9441,7 +9442,8 @@ public class PartitionedRegion extends LocalRegion
} catch (PrimaryBucketException pbe) {
throw new TransactionDataRebalancedException(
LocalizedStrings.PartitionedRegion_TRANSACTIONAL_DATA_MOVED_DUE_TO_REBALANCING
- .toLocalizedString(), pbe);
+ .toLocalizedString(),
+ pbe);
}
}
} catch (RegionDestroyedException ignore) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index eff9623..7aeaf19 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -344,8 +344,9 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
RegionAttributes ra = factory.create();
fail("Expected IllegalStateException to be thrown");
} catch (IllegalStateException e) {
- assertTrue(e.getMessage().contains(
- LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString("setDiskDirs or setDiskWriteAttributes", getUniqueName())));
+ assertTrue(e.getMessage()
+ .contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
+ .toLocalizedString("setDiskDirs or setDiskWriteAttributes", getUniqueName())));
}
try {
@@ -2452,9 +2453,9 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * Tests the client subscription attributes ({@code eviction-policy}, {@code capacity}
- * and {@code overflow-directory}) related to client subscription config in gemfire
- * cache-server framework
+ * Tests the client subscription attributes ({@code eviction-policy}, {@code capacity} and
+ * {@code overflow-directory}) related to client subscription config in gemfire cache-server
+ * framework
*
* @since GemFire 5.7
*/
@@ -2804,8 +2805,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* Tests the bridge-server attributes ({@code maximum-message-count} and
- * {@code message-time-to-live}) related to HA of client-queues in gemfire cache-server
- * framework
+ * {@code message-time-to-live}) related to HA of client-queues in gemfire cache-server framework
*/
@Test
public void testBridgeAttributesRelatedToClientQueuesHA() throws Exception {
@@ -3185,7 +3185,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
factory.setEvictionAttributes(ev);
// RegionAttributes atts = factory.create();
createRegion(name, factory.create());
- finishCacheXml(this.temporaryFolder.getRoot(), getUniqueName(), getUseSchema(), getGemFireVersion());
+ finishCacheXml(this.temporaryFolder.getRoot(), getUniqueName(), getUseSchema(),
+ getGemFireVersion());
Region r = getRootRegion().getSubregion(name);
EvictionAttributes hlea = r.getAttributes().getEvictionAttributes();
@@ -3233,8 +3234,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * A {@code TransactionListener} that is {@code Declarable}, but not
- * {@code Declarable2}.
+ * A {@code TransactionListener} that is {@code Declarable}, but not {@code Declarable2}.
*/
public static class MySecondTestTransactionListener extends TestTransactionListener
implements Declarable {
@@ -3352,8 +3352,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * Tests to make sure that we cannot create the same region multiple times in a
- * {@code cache.xml} file.
+ * Tests to make sure that we cannot create the same region multiple times in a {@code cache.xml}
+ * file.
*/
@Test
public void testCreateSameRegionTwice() throws Exception {
@@ -3434,8 +3434,8 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * Generates XML from the given {@code CacheCreation} and returns an {@code InputStream}
- * for reading that XML.
+ * Generates XML from the given {@code CacheCreation} and returns an {@code InputStream} for
+ * reading that XML.
*/
public InputStream generate(CacheCreation creation) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -4213,8 +4213,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * Tests parsing an XML file that specifies a cache listener that is not a
- * {@code CacheLoader}.
+ * Tests parsing an XML file that specifies a cache listener that is not a {@code CacheLoader}.
*/
@Test
public void testLoaderNotLoader() throws Exception {
@@ -4537,8 +4536,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
}
/**
- * A {@code TransactionListener} that is {@code Declarable}, but not
- * {@code Declarable2}.
+ * A {@code TransactionListener} that is {@code Declarable}, but not {@code Declarable2}.
*/
public static class MyTestTransactionListener extends TestTransactionListener
implements Declarable {
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
index 4fc8ed8..4f4a808 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
@@ -79,7 +79,8 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
@SuppressWarnings("rawtypes")
@Test
- public void testEnableOffHeapMemoryRootRegionWithoutOffHeapMemoryThrowsException() throws Exception {
+ public void testEnableOffHeapMemoryRootRegionWithoutOffHeapMemoryThrowsException()
+ throws Exception {
final String regionName = getUniqueName();
final CacheCreation cache = new CacheCreation();
@@ -109,7 +110,8 @@ public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
@SuppressWarnings({"rawtypes", "deprecation", "unchecked"})
@Test
- public void testEnableOffHeapMemorySubRegionWithoutOffHeapMemoryThrowsException() throws Exception {
+ public void testEnableOffHeapMemorySubRegionWithoutOffHeapMemoryThrowsException()
+ throws Exception {
final String rootRegionName = getUniqueName();
final String subRegionName = "subRegion";
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
index 43fc98f..2951c7a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
@@ -50,7 +50,8 @@ public class CacheXmlTestCase extends JUnit4CacheTestCase {
static boolean lonerDistributedSystem = true;
@Rule
- public DistributedRestoreSystemProperties restoreSystemProperties = new DistributedRestoreSystemProperties();
+ public DistributedRestoreSystemProperties restoreSystemProperties =
+ new DistributedRestoreSystemProperties();
@Rule
public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
@@ -99,8 +100,8 @@ public class CacheXmlTestCase extends JUnit4CacheTestCase {
*/
protected File findFile(String fileName) throws IOException {
return copyResourceToDirectory(this.temporaryFolder.getRoot(), fileName);
-// String path = TestUtil.getResourcePath(getClass(), fileName);
-// return new File(path);
+ // String path = TestUtil.getResourcePath(getClass(), fileName);
+ // return new File(path);
}
protected File copyResourceToDirectory(File directory, String fileName) throws IOException {
http://git-wip-us.apache.org/repos/asf/geode/blob/ba9744c1/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index a3321a3..4c1f2cb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -696,7 +696,8 @@ public class DescribeDiskStoreFunctionJUnitTest {
@Test
public void testExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
- IgnoredException ignoredException = IgnoredException.addIgnoredException(IllegalStateException.class.getName());
+ IgnoredException ignoredException =
+ IgnoredException.addIgnoredException(IllegalStateException.class.getName());
try {
doTestExecuteWithDiskDirsAndDiskSizesMismatch();
} finally {