From c05de2ff46fbeda72aff66536141313cdc2d8189 Mon Sep 17 00:00:00 2001 From: Deepak Dixit Date: Tue, 6 Jun 2017 22:39:14 +0530 Subject: [PATCH] GEODE-290:Removed deprecated methods from launcher classes. * Removed deprecated stopWithPort from LocatorLauncher class. * Removed deprecated members from LocatorLauncher and ServerLauncher classes. * Modified test cases to use constants alternate to deprecated ones. --- .../geode/distributed/LocatorLauncher.java | 26 ------------------- .../geode/distributed/ServerLauncher.java | 14 ---------- .../distributed/LocatorLauncherTest.java | 6 ++--- .../geode/distributed/ServerLauncherTest.java | 4 +-- 4 files changed, 5 insertions(+), 45 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java index e06949c94ab3..ae602d6957a3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java @@ -86,12 +86,6 @@ @SuppressWarnings({"unused"}) public class LocatorLauncher extends AbstractLauncher { - /** - * @deprecated This is specific to the internal implementation and may go away in a future - * release. - */ - public static final Integer DEFAULT_LOCATOR_PORT = getDefaultLocatorPort(); - private static final Boolean DEFAULT_LOAD_SHARED_CONFIG_FROM_DIR = Boolean.FALSE; private static final Map helpMap = new HashMap<>(); @@ -137,12 +131,6 @@ public class LocatorLauncher extends AbstractLauncher { usageMap.put(Command.VERSION, "version"); } - /** - * @deprecated This is specific to the internal implementation and may go away in a future - * release. - */ - public static final String DEFAULT_LOCATOR_PID_FILE = "vf.gf.locator.pid"; - private static final String DEFAULT_LOCATOR_LOG_EXT = ".log"; private static final String DEFAULT_LOCATOR_LOG_NAME = "locator"; private static final String LOCATOR_SERVICE_NAME = "Locator"; @@ -1083,20 +1071,6 @@ private LocatorState stopWithPid() { } } - @Deprecated - private LocatorState stopWithPort() { - try { - new TcpClient().stop(getBindAddress(), getPort()); - return new LocatorState(this, Status.STOPPED); - } catch (ConnectException e) { - if (getBindAddress() == null) { - return createNoResponseState(e, "Failed to connect to locator on port " + getPort()); - } else { - return createNoResponseState(e, "Failed to connect to locator on " + getId()); - } - } - } - private LocatorState stopWithWorkingDirectory() { int parsedPid = 0; try { diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java index 4de1a95f9acd..3d7e67dd6e86 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java @@ -98,13 +98,6 @@ @SuppressWarnings({"unused"}) public class ServerLauncher extends AbstractLauncher { - /** - * @deprecated This is specific to the internal implementation and may go away in a future - * release. - */ - @Deprecated - protected static final Integer DEFAULT_SERVER_PORT = getDefaultServerPort(); - private static final Map helpMap = new HashMap<>(); static { @@ -154,13 +147,6 @@ public class ServerLauncher extends AbstractLauncher { usageMap.put(Command.VERSION, "version"); } - /** - * @deprecated This is specific to the internal implementation and may go away in a future - * release. - */ - @Deprecated - public static final String DEFAULT_SERVER_PID_FILE = "vf.gf.server.pid"; - private static final String DEFAULT_SERVER_LOG_EXT = ".log"; private static final String DEFAULT_SERVER_LOG_NAME = "gemfire"; private static final String SERVER_SERVICE_NAME = "Server"; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java index d63da8755bed..bc7c37132a84 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java @@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.internal.DistributionLocator; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.UnitTest; @@ -299,8 +300,7 @@ public void testSetPidToInvalidValue() { @Test public void testSetAndGetPort() { Builder builder = new Builder(); - - assertEquals(LocatorLauncher.DEFAULT_LOCATOR_PORT, builder.getPort()); + assertEquals(Integer.valueOf(DistributionLocator.DEFAULT_LOCATOR_PORT), builder.getPort()); assertSame(builder, builder.setPort(65535)); assertEquals(65535, builder.getPort().intValue()); assertSame(builder, builder.setPort(1024)); @@ -312,7 +312,7 @@ public void testSetAndGetPort() { assertSame(builder, builder.setPort(0)); assertEquals(0, builder.getPort().intValue()); assertSame(builder, builder.setPort(null)); - assertEquals(LocatorLauncher.DEFAULT_LOCATOR_PORT, builder.getPort()); + assertEquals(Integer.valueOf(DistributionLocator.DEFAULT_LOCATOR_PORT), builder.getPort()); } @Test(expected = IllegalArgumentException.class) diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java index 9611e32386f3..e28421d580d2 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java @@ -330,7 +330,7 @@ public void testSetAndGetHostnameForClients() { public void testSetAndGetServerPort() { Builder builder = new Builder(); - assertEquals(ServerLauncher.DEFAULT_SERVER_PORT, builder.getServerPort()); + assertEquals(Integer.valueOf(CacheServer.DEFAULT_PORT), builder.getServerPort()); assertSame(builder, builder.setServerPort(0)); assertEquals(0, builder.getServerPort().intValue()); assertSame(builder, builder.setServerPort(1)); @@ -342,7 +342,7 @@ public void testSetAndGetServerPort() { assertSame(builder, builder.setServerPort(65535)); assertEquals(65535, builder.getServerPort().intValue()); assertSame(builder, builder.setServerPort(null)); - assertEquals(ServerLauncher.DEFAULT_SERVER_PORT, builder.getServerPort()); + assertEquals(Integer.valueOf(CacheServer.DEFAULT_PORT), builder.getServerPort()); } @Test(expected = IllegalArgumentException.class)