You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/07 23:12:58 UTC
geode git commit: Fix spotless format
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-21 1c3c00dcf -> cd57791fc
Fix spotless format
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/cd57791f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/cd57791f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/cd57791f
Branch: refs/heads/feature/GEODE-2632-21
Commit: cd57791fc6c8b68d6e3123e44dfecde22c6f16a3
Parents: 1c3c00d
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Jun 7 16:12:47 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Jun 7 16:12:47 2017 -0700
----------------------------------------------------------------------
.../cli/commands/CliCommandTestBase.java | 9 ++++----
.../RebalanceCommandDistributedTest.java | 22 ++++++++----------
.../ClusterConfigWithoutSecurityDUnitTest.java | 13 ++++++-----
.../geode/security/OtherPDXPostProcessor.java | 22 ++++++++----------
.../security/OtherSimplySecurityManager.java | 22 ++++++++----------
.../security/PDXPostProcessorDUnitTest.java | 10 ++++----
.../SecurityClusterConfigDUnitTest.java | 24 ++++++++++++--------
7 files changed, 62 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
index 9888182..bd5083c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
@@ -271,11 +271,12 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
CommandResult result = executeCommand(shell, command.toString());
if (!shell.isConnectedAndReady()) {
- throw new AssertionError("Execution of " + command + " failed to connect to manager " + endpoint
- + " result=" + commandResultToString(result));
+ throw new AssertionError("Execution of " + command + " failed to connect to manager "
+ + endpoint + " result=" + commandResultToString(result));
}
- info("Successfully connected to managing node using " + (this.useHttpOnConnect ? "HTTP" : "JMX"));
+ info("Successfully connected to managing node using "
+ + (this.useHttpOnConnect ? "HTTP" : "JMX"));
assertThat(shell.isConnectedAndReady()).isTrue();
}
@@ -305,7 +306,7 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
// Added to avoid trimming of the columns
info("Started testable shell: " + shell);
return shell;
- } catch (ClassNotFoundException|IOException e) {
+ } catch (ClassNotFoundException | IOException e) {
throw new AssertionError(e);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
index 9e8ecfd..d8c3095 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
@@ -1,18 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.geode.management.internal.cli.commands;
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index b4856bf..e90bc0a 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -91,9 +91,10 @@ public class ClusterConfigWithoutSecurityDUnitTest {
props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
props.setProperty(USE_CLUSTER_CONFIGURATION, "true");
- assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
- .isInstanceOf(GemFireConfigException.class)
- .hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+ assertThatThrownBy(
+ () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
+ .isInstanceOf(GemFireConfigException.class).hasMessage(
+ LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
}
@Test
@@ -102,9 +103,9 @@ public class ClusterConfigWithoutSecurityDUnitTest {
props.setProperty(SECURITY_MANAGER, "mySecurityManager");
props.setProperty(USE_CLUSTER_CONFIGURATION, "true");
- assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
- .isInstanceOf(GemFireSecurityException.class)
- .hasMessage("Instance could not be obtained, java.lang.ClassNotFoundException: mySecurityManager");
+ assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0)
+ .getPort())).isInstanceOf(GemFireSecurityException.class).hasMessage(
+ "Instance could not be obtained, java.lang.ClassNotFoundException: mySecurityManager");
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/security/OtherPDXPostProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/OtherPDXPostProcessor.java b/geode-core/src/test/java/org/apache/geode/security/OtherPDXPostProcessor.java
index ecf692c..336bc98 100644
--- a/geode-core/src/test/java/org/apache/geode/security/OtherPDXPostProcessor.java
+++ b/geode-core/src/test/java/org/apache/geode/security/OtherPDXPostProcessor.java
@@ -1,18 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.geode.security;
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/security/OtherSimplySecurityManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/OtherSimplySecurityManager.java b/geode-core/src/test/java/org/apache/geode/security/OtherSimplySecurityManager.java
index c9a9efa..159e3f4 100644
--- a/geode-core/src/test/java/org/apache/geode/security/OtherSimplySecurityManager.java
+++ b/geode-core/src/test/java/org/apache/geode/security/OtherSimplySecurityManager.java
@@ -1,18 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.geode.security;
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
index 729cde3..c4a2547 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
@@ -194,7 +194,8 @@ public class PDXPostProcessorDUnitTest extends JUnit4DistributedTestCase {
PDXPostProcessor pp =
(PDXPostProcessor) this.server.getCache().getSecurityService().getPostProcessor();
- Awaitility.await().atMost(2, TimeUnit.MINUTES).until(() -> assertThat(pp.getCount()).isEqualTo(2));
+ Awaitility.await().atMost(2, TimeUnit.MINUTES)
+ .until(() -> assertThat(pp.getCount()).isEqualTo(2));
}
@Test
@@ -211,8 +212,8 @@ public class PDXPostProcessorDUnitTest extends JUnit4DistributedTestCase {
this.client1.invoke(() -> {
GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
- gfsh.secureConnectAndVerify(this.server.getJmxPort(), GfshShellConnectionRule.PortType.jmxManger,
- "dataUser", "1234567");
+ gfsh.secureConnectAndVerify(this.server.getJmxPort(),
+ GfshShellConnectionRule.PortType.jmxManger, "dataUser", "1234567");
// get command
CommandResult result = gfsh.executeAndVerifyCommand("get --key=key1 --region=AuthRegion");
@@ -229,7 +230,8 @@ public class PDXPostProcessorDUnitTest extends JUnit4DistributedTestCase {
gfsh.close();
});
- PDXPostProcessor pp = (PDXPostProcessor) this.server.getCache().getSecurityService().getPostProcessor();
+ PDXPostProcessor pp =
+ (PDXPostProcessor) this.server.getCache().getSecurityService().getPostProcessor();
assertThat(pp).isNotNull(); // TODO: what else to check here?
}
http://git-wip-us.apache.org/repos/asf/geode/blob/cd57791f/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index ee2ecaf..46767ff 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -106,7 +106,8 @@ public class SecurityClusterConfigDUnitTest {
}
@Test
- public void serverWithDifferentSecurityManagerShouldThrowGemFireConfigException() throws Exception {
+ public void serverWithDifferentSecurityManagerShouldThrowGemFireConfigException()
+ throws Exception {
Properties props = new Properties();
// the following are needed for peer-to-peer authentication
@@ -116,9 +117,10 @@ public class SecurityClusterConfigDUnitTest {
props.setProperty(USE_CLUSTER_CONFIGURATION, "true");
// initial security properties should only contain initial set of values
- assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
- .isInstanceOf(GemFireConfigException.class)
- .hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+ assertThatThrownBy(
+ () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
+ .isInstanceOf(GemFireConfigException.class).hasMessage(
+ LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
}
@Test
@@ -133,9 +135,10 @@ public class SecurityClusterConfigDUnitTest {
props.setProperty(USE_CLUSTER_CONFIGURATION, "true");
// initial security properties should only contain initial set of values
- assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
- .isInstanceOf(GemFireConfigException.class)
- .hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
+ assertThatThrownBy(
+ () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
+ .isInstanceOf(GemFireConfigException.class).hasMessage(
+ LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
}
@Test
@@ -148,9 +151,10 @@ public class SecurityClusterConfigDUnitTest {
props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
- assertThatThrownBy(() -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
- .isInstanceOf(GemFireConfigException.class)
- .hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toLocalizedString());
+ assertThatThrownBy(
+ () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
+ .isInstanceOf(GemFireConfigException.class).hasMessage(
+ LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toLocalizedString());
}
}