http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java index 28d401f..43c8de6 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java @@ -16,11 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; -import java.util.Iterator; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.Region; @@ -28,14 +23,7 @@ import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.ServerRefusedConnectionException; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqException; -import com.gemstone.gemfire.cache.query.CqExistsException; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.CqQuery; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.ClientServerObserver; @@ -43,16 +31,12 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter; import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import org.junit.Ignore; +import org.junit.experimental.categories.Category; + +import java.util.Iterator; public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index ca2415d..4111248 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -16,23 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.junit.Ignore; - -import junit.framework.Assert; -import util.TestException; - import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.Region; @@ -40,35 +23,26 @@ import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqException; -import com.gemstone.gemfire.cache.query.CqExistsException; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.CqQuery; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl; import com.gemstone.gemfire.cache.query.internal.cq.CqService; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; -import com.gemstone.gemfire.internal.cache.ClientServerObserver; -import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter; -import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.InternalCache; -import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkUtils; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; +import junit.framework.Assert; +import org.junit.Ignore; +import util.TestException; + +import java.util.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Class <code>DurableClientTestCase</code> tests durable client @@ -177,7 +151,7 @@ public class DurableClientTestCase extends DistributedTestCase { */ public void testSimpleDurableClient2() { final Properties jp = new Properties(); - jp.setProperty("gemfire.SPECIAL_DURABLE", "true"); + jp.setProperty(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE", "true"); try { // Start a server @@ -1588,8 +1562,8 @@ public class DurableClientTestCase extends DistributedTestCase { protected Properties getClientDistributedSystemPropertiesNonDurable(String durableClientId) { Properties properties = new Properties(); - properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - properties.setProperty(DistributionConfig.LOCATORS_NAME, ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); return properties; } @@ -1597,8 +1571,8 @@ public class DurableClientTestCase extends DistributedTestCase { protected Properties getClientDistributedSystemProperties( String durableClientId, int durableClientTimeout) { Properties properties = new Properties(); - properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - properties.setProperty(DistributionConfig.LOCATORS_NAME, ""); + properties.setProperty(MCAST_PORT, "0"); + properties.setProperty(LOCATORS, ""); properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout)); return properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index 167cc3a..2a56dbf 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -41,6 +41,9 @@ import java.net.UnknownHostException; import java.util.Collections; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + /** * Cache Server related management test cases */ @@ -236,8 +239,8 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { protected void startLocator(Host vmHost, final int locatorPort, final String otherLocators) { disconnectFromDS(); Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0)); - props.setProperty(DistributionConfig.LOCATORS_NAME, otherLocators); + props.setProperty(MCAST_PORT, String.valueOf(0)); + props.setProperty(LOCATORS, otherLocators); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java index 6645129..ce230e2 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java @@ -16,31 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.NetworkUtils.*; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.concurrent.TimeUnit; -import javax.management.ObjectName; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.PoolManager; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.QueryService; @@ -70,11 +47,25 @@ import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import com.jayway.awaitility.Awaitility; - import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import javax.management.ObjectName; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName; + /** * Dunit class for testing gemfire Client commands : list client , describe client * @@ -734,10 +725,10 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { if (cache == null) { Properties props = getNonDurableClientProps(); - props.setProperty("log-file", "client_" + OSProcess.getId() + ".log"); - props.setProperty("log-level", "fine"); - props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() + ".gfs"); - props.setProperty("statistic-sampling-enabled", "true"); + props.setProperty(DistributionConfig.LOG_FILE_NAME, "client_" + OSProcess.getId() + ".log"); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + ".gfs"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); getSystem(props); @@ -798,14 +789,14 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { protected Properties getNonDurableClientProps() { Properties p = new Properties(); - p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - p.setProperty(DistributionConfig.LOCATORS_NAME, ""); + p.setProperty(MCAST_PORT, "0"); + p.setProperty(LOCATORS, ""); return p; } protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + getDUnitLocatorPort() + "]"); + p.setProperty(LOCATORS, "localhost[" + getDUnitLocatorPort() + "]"); return p; } @@ -1072,10 +1063,10 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { if (cache == null) { Properties props = getNonDurableClientProps(); - props.setProperty("log-file", "client_" + OSProcess.getId() + ".log"); - props.setProperty("log-level", "fine"); - props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() + ".gfs"); - props.setProperty("statistic-sampling-enabled", "true"); + props.setProperty(DistributionConfig.LOG_FILE_NAME, "client_" + OSProcess.getId() + ".log"); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "client_" + OSProcess.getId() + ".gfs"); + props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java index 37b716d..e059b87 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java @@ -16,29 +16,10 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.NetworkUtils.*; - -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqException; -import com.gemstone.gemfire.cache.query.CqExistsException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; @@ -56,6 +37,17 @@ import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.assertTrue; +import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName; @Category(DistributedTest.class) public class DurableClientCommandsDUnitTest extends CliCommandTestBase { @@ -407,8 +399,8 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { protected Properties getClientProps(String durableClientId, String durableClientTimeout) { Properties p = new Properties(); - p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - p.setProperty(DistributionConfig.LOCATORS_NAME, ""); + p.setProperty(MCAST_PORT, "0"); + p.setProperty(LOCATORS, ""); p.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId); p.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout)); return p; @@ -416,7 +408,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase { protected Properties getServerProperties() { Properties p = new Properties(); - p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]"); + p.setProperty(LOCATORS, "localhost[" + getDUnitLocatorPort() + "]"); return p; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java index 9d7ffb9..8f8a2a7 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java @@ -16,21 +16,11 @@ */ package com.gemstone.gemfire.security; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.security.SecurityTestUtils.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.Random; - -import com.gemstone.gemfire.internal.AvailablePortHelper; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.Instantiator; import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.security.FilterPostAuthorization; import com.gemstone.gemfire.internal.security.FilterPreAuthorization; import com.gemstone.gemfire.internal.security.ObjectWithAuthz; @@ -41,6 +31,16 @@ import com.gemstone.gemfire.security.templates.UserPasswordAuthInit; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import com.gemstone.gemfire.test.junit.categories.SecurityTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.Random; + +import static com.gemstone.gemfire.security.SecurityTestUtils.closeCache; +import static com.gemstone.gemfire.security.SecurityTestUtils.getLocatorPort; /** * Tests for authorization callback that modify objects and callbacks from @@ -212,13 +212,13 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase { private Properties buildProperties(final String authenticator, final Properties extraProps, final String preAccessor, final String postAccessor) { Properties authProps = new Properties(); if (authenticator != null) { - authProps.setProperty(SECURITY_CLIENT_AUTHENTICATOR_NAME, authenticator); + authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); } if (preAccessor != null) { - authProps.setProperty(SECURITY_CLIENT_ACCESSOR_NAME, preAccessor); + authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR, preAccessor); } if (postAccessor != null) { - authProps.setProperty(SECURITY_CLIENT_ACCESSOR_PP_NAME, postAccessor); + authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor); } if (extraProps != null) { authProps.putAll(extraProps); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java index 9bbceff..28b3707 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java @@ -16,19 +16,6 @@ */ package com.gemstone.gemfire.security; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.security.SecurityTestUtils.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; - -import java.io.IOException; -import java.util.Properties; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLHandshakeException; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.execute.FunctionService; @@ -36,12 +23,24 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.CqException; import com.gemstone.gemfire.cache.query.CqQuery; import com.gemstone.gemfire.cache.query.Query; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PoolManagerImpl; import com.gemstone.gemfire.security.generator.CredentialGenerator; import com.gemstone.gemfire.security.generator.DummyCredentialGenerator; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.SecurityTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLHandshakeException; +import java.io.IOException; +import java.util.Properties; + +import static com.gemstone.gemfire.security.SecurityTestUtils.NO_EXCEPTION; +import static com.gemstone.gemfire.test.dunit.Assert.fail; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @Category({ DistributedTest.class, SecurityTest.class }) public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase { @@ -298,7 +297,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase { } if (authenticator != null) { - authProps.setProperty(SECURITY_CLIENT_AUTHENTICATOR_NAME, authenticator); + authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); } return SecurityTestUtils.createCacheServer(authProps, javaProps, dsPort, locatorString, 0, NO_EXCEPTION); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java index ee4e5bb..88631b8 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java @@ -19,24 +19,19 @@ package com.gemstone.gemfire.cache.lucene.internal.repository; -import java.io.IOException; -import java.util.Iterator; - -import org.apache.logging.log4j.Logger; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.ScoreDoc; -import org.apache.lucene.search.SearcherManager; -import org.apache.lucene.search.TopDocs; - import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.SerializerUtil; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.logging.log4j.Logger; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.*; + +import java.io.IOException; /** * A repository that writes to a single lucene index writer @@ -44,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.LogService; public class IndexRepositoryImpl implements IndexRepository { private static final boolean APPLY_ALL_DELETES = System - .getProperty("gemfire.IndexRepository.APPLY_ALL_DELETES", "true") + .getProperty(DistributionConfig.GEMFIRE_PREFIX + "IndexRepository.APPLY_ALL_DELETES", "true") .equalsIgnoreCase("true"); private final IndexWriter writer; @@ -52,7 +47,7 @@ public class IndexRepositoryImpl implements IndexRepository { private final SearcherManager searcherManager; private Region<?,?> region; private LuceneIndexStats stats; - + private static final Logger logger = LogService.getLogger(); public IndexRepositoryImpl(Region<?,?> region, IndexWriter writer, LuceneSerializer serializer, LuceneIndexStats stats) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java index 8f10c26..9867325 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java @@ -18,23 +18,22 @@ */ package com.gemstone.gemfire.cache.lucene; -import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*; -import static org.junit.Assert.assertEquals; - -import java.util.function.Consumer; - import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import java.util.function.Consumer; + +import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.REGION_NAME; +import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.createIndex; +import static org.junit.Assert.assertEquals; + /** * Tests of lucene index creation that use off heap memory */ @@ -50,7 +49,7 @@ public class LuceneIndexCreationOffHeapIntegrationTest extends LuceneIntegration @Override protected CacheFactory getCacheFactory() { CacheFactory factory = super.getCacheFactory(); - factory.set("off-heap-memory-size", "100m"); + factory.set(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m"); return factory; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java index 0d71cbb..cb51ff5 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java @@ -19,24 +19,16 @@ package com.gemstone.gemfire.cache.lucene; -import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.REGION_NAME; - -import java.io.File; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.lucene.LuceneService; -import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl; -import com.gemstone.gemfire.test.junit.rules.DiskDirRule; - +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import org.junit.After; import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestName; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; + public class LuceneIntegrationTest { @@ -60,9 +52,9 @@ public class LuceneIntegrationTest { protected CacheFactory getCacheFactory() { CacheFactory cf = new CacheFactory(); - cf.set("mcast-port", "0"); - cf.set("log-level", System.getProperty("logLevel", "info")); - cf.set("locators", ""); + cf.set(MCAST_PORT, "0"); + cf.set(SystemConfigurationProperties.LOCATORS, ""); + cf.set(SystemConfigurationProperties.LOG_LEVEL, System.getProperty("logLevel", "info")); return cf; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java index 70b39e7..1362a19 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java @@ -18,24 +18,7 @@ */ package com.gemstone.gemfire.cache.lucene.internal; -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystemStats; @@ -46,12 +29,22 @@ import com.gemstone.gemfire.internal.cache.BucketNotFoundException; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.IOException; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; @Category(IntegrationTest.class) public class LuceneIndexRecoveryHAIntegrationTest { - - private static final String INDEX = "index"; - private static final String REGION = "indexedRegion"; String[] indexedFields = new String[] { "txt" }; HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(indexedFields); Analyzer analyzer = new StandardAnalyzer(); @@ -67,7 +60,7 @@ public class LuceneIndexRecoveryHAIntegrationTest { analyzer = new StandardAnalyzer(); LuceneServiceImpl.registerDataSerializables(); - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); indexStats = new LuceneIndexStats(cache.getDistributedSystem(), "INDEX-REGION"); fileSystemStats = new FileSystemStats(cache.getDistributedSystem(), "INDEX-REGION"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java index a078910..67853f9 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java @@ -19,8 +19,6 @@ package com.gemstone.gemfire.cache.lucene.internal; -import static org.junit.Assert.*; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.client.ClientCache; @@ -31,13 +29,16 @@ import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; - import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @Category(IntegrationTest.class) public class LuceneServiceImplIntegrationTest { @@ -89,7 +90,7 @@ public class LuceneServiceImplIntegrationTest { private ClientCache getClientCache() { if (null == clientCache) { - clientCache = new ClientCacheFactory().set("mcast-port", "0").create(); + clientCache = new ClientCacheFactory().set(MCAST_PORT, "0").create(); } else { return clientCache; @@ -99,7 +100,7 @@ public class LuceneServiceImplIntegrationTest { private Cache getCache() { if (null == cache) { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); } return cache; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java index 90c6032..ad5b3a3 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java @@ -19,17 +19,20 @@ package com.gemstone.gemfire.cache.lucene.internal.repository; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; - +import com.gemstone.gemfire.DataSerializable; +import com.gemstone.gemfire.DataSerializer; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; +import com.gemstone.gemfire.cache.lucene.*; +import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl; +import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; +import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector; +import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; +import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; +import com.gemstone.gemfire.cache.query.QueryException; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.test.junit.categories.PerformanceTest; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; @@ -46,31 +49,14 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.lucene.LuceneIndex; -import com.gemstone.gemfire.cache.lucene.LuceneQuery; -import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider; -import com.gemstone.gemfire.cache.lucene.LuceneQueryResults; -import com.gemstone.gemfire.cache.lucene.LuceneService; -import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; -import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats; -import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl; -import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; -import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector; -import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; -import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; -import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystemStats; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.test.junit.categories.PerformanceTest; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Microbenchmark of the IndexRepository to compare an @@ -110,8 +96,8 @@ public class IndexRepositoryImplPerformanceTest { @Override public void init() throws Exception { - cache = new CacheFactory().set("mcast-port", "0") - .set("log-level", "error") + cache = new CacheFactory().set(MCAST_PORT, "0") + .set(LOG_LEVEL, "error") .create(); Region<String, File> fileRegion = cache.<String, File>createRegionFactory(RegionShortcut.REPLICATE).create("files"); Region<ChunkKey, byte[]> chunkRegion = cache.<ChunkKey, byte[]>createRegionFactory(RegionShortcut.REPLICATE).create("chunks"); @@ -173,8 +159,8 @@ public class IndexRepositoryImplPerformanceTest { @Override public void init() throws Exception { - cache = new CacheFactory().set("mcast-port", "0") - .set("log-level", "warning") + cache = new CacheFactory().set(MCAST_PORT, "0") + .set(LOG_LEVEL, "warning") .create(); service = LuceneServiceProvider.get(cache); service.createIndex("index", "/region", "text"); @@ -224,8 +210,8 @@ public class IndexRepositoryImplPerformanceTest { @Override public void init() throws Exception { - cache = new CacheFactory().set("mcast-port", "0") - .set("log-level", "warning") + cache = new CacheFactory().set(MCAST_PORT, "0") + .set(LOG_LEVEL, "warning") .create(); final FileSystemStats stats = new FileSystemStats(cache.getDistributedSystem(), "stats"); RegionDirectory dir = new RegionDirectory(new ConcurrentHashMap<String, File>(), new ConcurrentHashMap<ChunkKey, byte[]>(), stats); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java index 0c9d500..28a364d 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java @@ -19,17 +19,6 @@ package com.gemstone.gemfire.cache.lucene.internal.xml; -import static org.junit.Assert.*; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.PrintWriter; -import java.nio.charset.Charset; - -import org.junit.After; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.RegionShortcut; @@ -38,6 +27,17 @@ import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; +import java.nio.charset.Charset; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.*; @Category(IntegrationTest.class) public class LuceneIndexXmlGeneratorIntegrationJUnitTest { @@ -54,7 +54,7 @@ public class LuceneIndexXmlGeneratorIntegrationJUnitTest { */ @Test public void generateWithFields() { - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); LuceneService service = LuceneServiceProvider.get(cache); service.createIndex("index", "region", "a", "b", "c"); cache.createRegionFactory(RegionShortcut.PARTITION).create("region"); @@ -66,7 +66,7 @@ public class LuceneIndexXmlGeneratorIntegrationJUnitTest { pw.flush(); cache.close(); - cache = new CacheFactory().set("mcast-port", "0").create(); + cache = new CacheFactory().set(MCAST_PORT, "0").create(); byte[] bytes = baos.toByteArray(); ByteArrayInputStream in = new ByteArrayInputStream(bytes); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java index f2972d4..edeee3a 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java @@ -19,29 +19,12 @@ package com.gemstone.gemfire.cache.lucene.internal.xml; -import static org.junit.Assert.*; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.core.KeywordAnalyzer; -import org.apache.lucene.analysis.core.SimpleAnalyzer; -import org.apache.lucene.analysis.standard.ClassicAnalyzer; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TestName; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.extension.Extension; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; @@ -49,6 +32,25 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser; import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.util.test.TestUtil; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.core.KeywordAnalyzer; +import org.apache.lucene.analysis.core.SimpleAnalyzer; +import org.apache.lucene.analysis.standard.ClassicAnalyzer; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; @Category(IntegrationTest.class) public class LuceneIndexXmlParserIntegrationJUnitTest { @@ -126,8 +128,8 @@ public class LuceneIndexXmlParserIntegrationJUnitTest { @Test public void createIndex() throws FileNotFoundException { CacheFactory cf = new CacheFactory(); - cf.set("mcast-port", "0"); - cf.set("cache-xml-file", getXmlFileForTest()); + cf.set(MCAST_PORT, "0"); + cf.set(DistributionConfig.CACHE_XML_FILE_NAME, getXmlFileForTest()); Cache cache = cf.create(); LuceneService service = LuceneServiceProvider.get(cache); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java index 12efa1a..dbac007 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; + /** * @@ -39,7 +41,7 @@ import java.util.Properties; public class GemFireDistributedSystem { private static final String SERVERS = "servers"; - private static final String LOCATORS = "locators"; + private static final String LOCATORS_NAME = LOCATORS; private static final String PEERS = "peers"; private static final String HOSTS = "hosts"; private static final String REGIONS = "regions"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java index 3759895..f4f3e40 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java @@ -18,39 +18,33 @@ */ package com.vmware.gemfire.tools.pulse.tests; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectName; -import javax.management.remote.JMXConnectorServer; -import javax.management.remote.JMXConnectorServerFactory; -import javax.management.remote.JMXServiceURL; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.security.shiro.CustomAuthRealm; +import com.gemstone.gemfire.internal.security.shiro.JMXShiroAuthenticator; import com.gemstone.gemfire.management.internal.security.AccessControlMBean; import com.gemstone.gemfire.management.internal.security.JSONAuthorization; import com.gemstone.gemfire.management.internal.security.MBeanServerWrapper; import com.gemstone.gemfire.management.internal.security.ResourceConstants; -import com.gemstone.gemfire.internal.security.shiro.CustomAuthRealm; -import com.gemstone.gemfire.internal.security.shiro.JMXShiroAuthenticator; import com.vmware.gemfire.tools.pulse.internal.data.PulseConstants; - import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.DefaultSecurityManager; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.realm.Realm; +import javax.management.*; +import javax.management.remote.JMXConnectorServer; +import javax.management.remote.JMXConnectorServerFactory; +import javax.management.remote.JMXServiceURL; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.Inet4Address; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + public class Server { private static final String DEFAULT_HOST = "127.0.0.1"; //"localhost" private static final int DEFAULT_PORT = 9999; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java index fe9da93..5174806 100755 --- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java +++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java @@ -16,24 +16,6 @@ */ package com.gemstone.gemfire.cache.util; -import static com.jayway.awaitility.Awaitility.await; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.util.AutoBalancer.CacheOperationFacade; @@ -44,6 +26,22 @@ import com.gemstone.gemfire.distributed.internal.locks.DLockService; import com.gemstone.gemfire.internal.HostStatSampler; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayInputStream; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.jayway.awaitility.Awaitility.await; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.*; /** * IntegrationTests for AutoBalancer that include usage of Cache, StatSampler @@ -174,7 +172,7 @@ public class AutoBalancerIntegrationJUnitTest { } private GemFireCacheImpl createBasicCache() { - return (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").create(); + return (GemFireCacheImpl) new CacheFactory().set(MCAST_PORT, "0").create(); } private Callable<Boolean> isAlive(final HostStatSampler statSampler) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java index 8f5a045..fd7dd50 100644 --- a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java +++ b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java @@ -58,7 +58,7 @@ public class JavaApiIntegrationTest extends JUnitSuite { public static void setUpBeforeClass() throws Exception { // start geode cluster, and spark context Properties settings = new Properties(); - settings.setProperty("cache-xml-file", "src/it/resources/test-retrieve-regions.xml"); + settings.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, "src/it/resources/test-retrieve-regions.xml"); settings.setProperty("num-of-servers", Integer.toString(numServers)); int locatorPort = GeodeCluster$.MODULE$.start(settings); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java index e25b6c9..bbaed1d 100644 --- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java +++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java @@ -16,12 +16,7 @@ */ package com.gemstone.gemfire.cache.client.internal.locator.wan; -import java.io.IOException; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.distributed.internal.InternalLocator; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer; import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; @@ -29,7 +24,10 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.tcp.ConnectionException; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.concurrent.ConcurrentHashMap; /** * This class represent a runnable task which exchange the locator information @@ -79,13 +77,13 @@ public class LocatorDiscovery{ * practice. */ private static final int FAILURE_MAP_MAXSIZE = Integer.getInteger( - "gemfire.GatewaySender.FAILURE_MAP_MAXSIZE", 1000000); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.FAILURE_MAP_MAXSIZE", 1000000); /** * The maximum interval for logging failures of the same event in millis. */ private static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger( - "gemfire.LocatorDiscovery.FAILURE_LOG_MAX_INTERVAL", 300000); + DistributionConfig.GEMFIRE_PREFIX + "LocatorDiscovery.FAILURE_LOG_MAX_INTERVAL", 300000); public final boolean skipFailureLogging(DistributionLocatorId locatorId) { boolean skipLogging = false; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java index 4a49764..5f4943d 100644 --- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java +++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java @@ -16,40 +16,21 @@ */ package com.gemstone.gemfire.cache.client.internal.locator.wan; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; -import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorJoinMessage; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinRequest; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinResponse; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorPingRequest; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorPingResponse; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorRequest; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorResponse; +import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; import com.gemstone.gemfire.internal.CopyOnWriteHashSet; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; -import com.gemstone.gemfire.internal.cache.tier.Command; -import com.gemstone.gemfire.internal.cache.tier.MessageType; -import com.gemstone.gemfire.internal.cache.tier.sockets.CommandInitializer; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; +import org.apache.logging.log4j.Logger; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; /** * An implementation of http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java index f031143..cde1e15 100644 --- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java +++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java @@ -16,25 +16,18 @@ */ package com.gemstone.gemfire.cache.client.internal.locator.wan; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorDiscovery; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; -import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinRequest; import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; +import org.apache.logging.log4j.Logger; + +import java.util.StringTokenizer; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; public class WanLocatorDiscovererImpl implements WanLocatorDiscoverer{ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java index 7e35df6..d45d5ef 100644 --- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java +++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java @@ -16,29 +16,26 @@ */ package com.gemstone.gemfire.internal.cache.wan; -import java.io.IOException; -import java.net.ConnectException; -import java.util.Iterator; -import java.util.Properties; -import java.util.StringTokenizer; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorRequest; import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorResponse; import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer; +import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.net.ConnectException; +import java.util.Iterator; +import java.util.StringTokenizer; public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java index 2040e5f..22f5df4 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java @@ -16,34 +16,11 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.File; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.StringTokenizer; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter; import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; +import com.gemstone.gemfire.cache.wan.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; @@ -53,16 +30,14 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionStamp; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.File; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * @since GemFire 7.0.1 @@ -652,8 +627,8 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { private static void createCache(Integer locPort) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + locPort + "]"); props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -792,10 +767,10 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); - props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); + props.setProperty(LOCATORS, "localhost[" + port + "]"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]"); props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -859,8 +834,8 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { public static int createReceiver(int locPort) { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + locPort + "]"); InternalDistributedSystem ds = test.getSystem(props); @@ -952,12 +927,12 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = test.getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]"); + props.setProperty(LOCATORS, "localhost[" + port + "]"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false"); - props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); + props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost"); test.getSystem(props); return port; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java index 0b1cd11..9710549 100755 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java @@ -16,48 +16,28 @@ */ package com.gemstone.gemfire.internal.cache.wan; -import java.io.IOException; -import java.util.List; -import java.util.Properties; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter; -import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder; -import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.ha.HAContainerRegion; -import com.gemstone.gemfire.internal.cache.ha.HAContainerWrapper; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; -import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; -import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableCallable; -import com.gemstone.gemfire.test.dunit.SerializableRunnable; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.test.junit.categories.FlakyTest; +import com.gemstone.gemfire.test.dunit.*; + +import java.io.IOException; +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; public class CacheClientNotifierDUnitTest extends WANTestBase { private static final int NUM_KEYS = 10; @@ -244,11 +224,11 @@ public class CacheClientNotifierDUnitTest extends WANTestBase { String regionName, String clientId, boolean isDurable) { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); - props.setProperty("mcast-port", "0"); - props.setProperty("locators", ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); if (isDurable) { - props.setProperty("durable-client-id", clientId); - props.setProperty("durable-client-timeout", "" + 200); + props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, clientId); + props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 200); } InternalDistributedSystem ds = test.getSystem(props);
