You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2017/10/26 15:41:30 UTC
[geode] branch develop updated: GEODE-3910: Simplify MemberVM -
remove generic type (#981)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 5ca7659 GEODE-3910: Simplify MemberVM - remove generic type (#981)
5ca7659 is described below
commit 5ca76598fa0d103b1be025112afe1dd063b69c95
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Thu Oct 26 08:41:28 2017 -0700
GEODE-3910: Simplify MemberVM - remove generic type (#981)
---
...ainWithChildrenRollingFileHandlerDUnitTest.java | 14 +++++------
.../commands/ExportLogsOnServerManagerDUnit.java | 9 +++----
.../internal/configuration/ClusterConfig.java | 29 +++++++++++-----------
.../PDXGfshPostProcessorOnRemoteServerTest.java | 23 ++++++++---------
.../SecurityWithoutClusterConfigDUnitTest.java | 18 +++++++-------
.../security/StartServerAuthorizationTest.java | 16 ++++++------
.../test/dunit/rules/LocatorServerStartupRule.java | 5 ++--
.../apache/geode/test/dunit/rules/MemberVM.java | 15 +++++++----
8 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
index d7442fa..70bf248 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
@@ -17,17 +17,17 @@ package org.apache.geode.internal.io;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import java.net.InetAddress;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.test.junit.rules.Locator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.net.InetAddress;
@Category(DistributedTest.class)
public class MainWithChildrenRollingFileHandlerDUnitTest {
@@ -37,7 +37,7 @@ public class MainWithChildrenRollingFileHandlerDUnitTest {
@Test
public void testGeode2874_nameWithoutExtensionDoesNotThrowOnMemberRestart() throws Exception {
- MemberVM<Locator> locatorVM = locatorServerStartupRule.startLocatorVM(0);
+ MemberVM locatorVM = locatorServerStartupRule.startLocatorVM(0);
ClientCacheFactory clientCacheFactory = new ClientCacheFactory();
clientCacheFactory.addPoolLocator(InetAddress.getLocalHost().toString(), locatorVM.getPort());
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
index 5aa23e3..b58f24f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
@@ -27,11 +27,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.Server;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category(DistributedTest.class)
@@ -63,9 +62,9 @@ public class ExportLogsOnServerManagerDUnit {
@Test
public void testExportWithPeerLocator() throws Exception {
- MemberVM<Server> server0 = lsRule.startServerAsEmbededLocator(0);
- lsRule.startServerVM(1, server0.getMember().getEmbeddedLocatorPort());
- gfshConnector.connect(server0.getMember().getEmbeddedLocatorPort(),
+ MemberVM server0 = lsRule.startServerAsEmbededLocator(0);
+ lsRule.startServerVM(1, server0.getEmbeddedLocatorPort());
+ gfshConnector.connect(server0.getEmbeddedLocatorPort(),
GfshShellConnectionRule.PortType.locator);
gfshConnector.executeAndVerifyCommand("export logs");
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
index d4af3e9..9833b2d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
@@ -21,19 +21,6 @@ import static java.util.stream.Collectors.toSet;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.distributed.internal.ClusterConfigurationService;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.DeployedJar;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.rules.Locator;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.Server;
-
import java.io.File;
import java.io.Serializable;
import java.net.URL;
@@ -48,6 +35,18 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.DeployedJar;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.internal.configuration.domain.Configuration;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
public class ClusterConfig implements Serializable {
private List<ConfigGroup> groups;
@@ -87,7 +86,7 @@ public class ClusterConfig implements Serializable {
verifyServer(memberVM);
}
- public void verifyLocator(MemberVM<Locator> locatorVM) {
+ public void verifyLocator(MemberVM locatorVM) {
Set<String> expectedGroupConfigs =
this.getGroups().stream().map(ConfigGroup::getName).collect(toSet());
@@ -133,7 +132,7 @@ public class ClusterConfig implements Serializable {
}
}
- public void verifyServer(MemberVM<Server> serverVM) {
+ public void verifyServer(MemberVM serverVM) {
// verify files exist in filesystem
Set<String> expectedJarNames = this.getJarNames().stream().collect(toSet());
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
index ce3fd95..d8ba08b 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
@@ -20,6 +20,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -29,20 +37,11 @@ import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.pdx.SimpleClass;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
-import org.apache.geode.test.junit.rules.Locator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.Server;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.awaitility.Awaitility;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
+import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
@Category({DistributedTest.class, SecurityTest.class})
public class PDXGfshPostProcessorOnRemoteServerTest {
@@ -63,7 +62,7 @@ public class PDXGfshPostProcessorOnRemoteServerTest {
locatorProps.setProperty(SECURITY_MANAGER, TestSecurityManager.class.getName());
locatorProps.setProperty(SECURITY_POST_PROCESSOR, PDXPostProcessor.class.getName());
- MemberVM<Locator> locatorVM = lsRule.startLocatorVM(0, locatorProps);
+ MemberVM locatorVM = lsRule.startLocatorVM(0, locatorProps);
Properties serverProps = new Properties(locatorProps);
serverProps.setProperty(TestSecurityManager.SECURITY_JSON,
@@ -73,7 +72,7 @@ public class PDXGfshPostProcessorOnRemoteServerTest {
serverProps.setProperty("security-username", "super-user");
serverProps.setProperty("security-password", "1234567");
- MemberVM<Server> serverVM = lsRule.startServerVM(1, serverProps, locatorVM.getPort());
+ MemberVM serverVM = lsRule.startServerVM(1, serverProps, locatorVM.getPort());
serverVM.invoke(() -> {
InternalCache cache = LocatorServerStartupRule.serverStarter.getCache();
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
index 427daed..cc752d1 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
@@ -21,21 +21,21 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.rules.Locator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
@@ -47,7 +47,7 @@ public class SecurityWithoutClusterConfigDUnitTest {
@Rule
public ServerStarterRule serverStarter = new ServerStarterRule();
- private MemberVM<Locator> locator;
+ private MemberVM locator;
@Before
public void before() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java b/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
index 31e3452..1848292 100644
--- a/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
@@ -18,26 +18,26 @@ package org.apache.geode.security;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.geode.test.junit.rules.Locator;
-import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
+import java.util.Properties;
+
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.util.Properties;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category({DistributedTest.class, SecurityTest.class})
public class StartServerAuthorizationTest {
@ClassRule
public static LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
- private static MemberVM<Locator> locator = null;
+ private static MemberVM locator = null;
@Rule
public ServerStarterRule serverStarter = new ServerStarterRule();
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
index ae8c2ff..0a8d4ec 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
@@ -120,7 +120,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
}
}
- public MemberVM<Locator> startLocatorVM(int index) throws Exception {
+ public MemberVM startLocatorVM(int index) throws Exception {
return startLocatorVM(index, new Properties());
}
@@ -130,8 +130,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
*
* @return VM locator vm
*/
- public MemberVM<Locator> startLocatorVM(int index, Properties specifiedProperties)
- throws Exception {
+ public MemberVM startLocatorVM(int index, Properties specifiedProperties) throws Exception {
Properties properties = new Properties();
properties.putAll(specifiedProperties);
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java
index 18c6985..71aa58e 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java
@@ -21,22 +21,23 @@ import java.util.Arrays;
import org.apache.commons.io.FileUtils;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.rules.Locator;
import org.apache.geode.test.junit.rules.Member;
import org.apache.geode.test.junit.rules.Server;
-public class MemberVM<T extends Member> implements Member {
- private T member;
+public class MemberVM implements Member {
+ private Member member;
private VM vm;
private boolean tempWorkingDir;
- public MemberVM(T member, VM vm) {
+ public MemberVM(Member member, VM vm) {
this(member, vm, false);
}
- public MemberVM(T member, VM vm, boolean tempWorkingDir) {
+ public MemberVM(Member member, VM vm, boolean tempWorkingDir) {
this.member = member;
this.vm = vm;
this.tempWorkingDir = tempWorkingDir;
@@ -54,11 +55,15 @@ public class MemberVM<T extends Member> implements Member {
vm.invoke(runnable);
}
+ public <T> T invoke(final SerializableCallableIF<T> callable) {
+ return vm.invoke(callable);
+ }
+
public AsyncInvocation invokeAsync(final SerializableRunnableIF runnable) {
return vm.invokeAsync(runnable);
}
- public T getMember() {
+ public Member getMember() {
return member;
}
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].