Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 52900200BEA for ; Mon, 12 Dec 2016 23:36:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 51370160B22; Mon, 12 Dec 2016 22:36:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 48AA9160B2A for ; Mon, 12 Dec 2016 23:36:09 +0100 (CET) Received: (qmail 76774 invoked by uid 500); 12 Dec 2016 22:36:08 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 74155 invoked by uid 99); 12 Dec 2016 22:36:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2016 22:36:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 762DDF2DCD; Mon, 12 Dec 2016 22:36:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Mon, 12 Dec 2016 22:36:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/46] geode git commit: Fix formatting archived-at: Mon, 12 Dec 2016 22:36:10 -0000 http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-core/src/test/java/org/apache/geode/test/dunit/rules/WhichVMs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/WhichVMs.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/WhichVMs.java index 4ee6020..1048f2e 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/WhichVMs.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/WhichVMs.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.test.dunit.rules; @@ -25,22 +23,23 @@ import java.io.Serializable; * * TODO: add ability to specify order */ -public class WhichVMs implements Serializable{ +public class WhichVMs implements Serializable { private boolean controllerVM; private boolean everyVM; private boolean locatorVM; - public WhichVMs() { - } + public WhichVMs() {} public WhichVMs addControllerVM() { this.controllerVM = true; return this; } + public WhichVMs addEveryVM() { this.everyVM = true; return this; } + public WhichVMs addLocatorVM() { this.locatorVM = true; return this; @@ -49,9 +48,11 @@ public class WhichVMs implements Serializable{ public boolean controllerVM() { return this.controllerVM; } + public boolean everyVM() { return this.everyVM; } + public boolean locatorVM() { return this.locatorVM; } http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java index 8352db2..7dded64 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleTest.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.test.dunit.rules.tests; http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java index 5c0bbdb..11f572b 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java @@ -83,7 +83,8 @@ public class DUnitLauncher { private static final int LOCATOR_VM_NUM = -2; static final long STARTUP_TIMEOUT = 120 * 1000; - private static final String STARTUP_TIMEOUT_MESSAGE = "VMs did not start up within " + (STARTUP_TIMEOUT/1000) + " seconds"; + private static final String STARTUP_TIMEOUT_MESSAGE = + "VMs did not start up within " + (STARTUP_TIMEOUT / 1000) + " seconds"; private static final String SUSPECT_FILENAME = "dunit_suspect.log"; private static File DUNIT_SUSPECT_FILE; @@ -201,8 +202,8 @@ public class DUnitLauncher { // Create a VM for the locator processManager.launchVM(LOCATOR_VM_NUM); - //wait for the VM to start up - if(!processManager.waitForVMs(STARTUP_TIMEOUT)) { + // wait for the VM to start up + if (!processManager.waitForVMs(STARTUP_TIMEOUT)) { throw new RuntimeException("VMs did not start up within 30 seconds"); } @@ -216,8 +217,8 @@ public class DUnitLauncher { processManager.launchVM(i); } - //wait for the VMS to start up - if(!processManager.waitForVMs(STARTUP_TIMEOUT)) { + // wait for the VMS to start up + if (!processManager.waitForVMs(STARTUP_TIMEOUT)) { throw new RuntimeException("VMs did not start up within 30 seconds"); } http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java ---------------------------------------------------------------------- diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java index 03d5a60..c7c326a 100644 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.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.test.junit.rules; @@ -32,7 +30,9 @@ import org.apache.geode.test.junit.rules.serializable.SerializableExternalResour /** * JUnit Rule that configures json-path to use the {@code JacksonJsonProvider} * - *

UseJacksonForJsonPathRule can be used in tests that need to use json-path-assert: + *

+ * UseJacksonForJsonPathRule can be used in tests that need to use json-path-assert: + * * 

  * {@literal @}ClassRule
  * public static UseJacksonForJsonPathRule useJacksonForJsonPathRule = new UseJacksonForJsonPathRule();
@@ -45,7 +45,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableExternalResour
  * }
  *
*/ -@SuppressWarnings({ "serial", "unused" }) +@SuppressWarnings({"serial", "unused"}) public class UseJacksonForJsonPathRule extends SerializableExternalResource { private boolean hadDefaults; http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java ---------------------------------------------------------------------- diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java index 75f4575..be561df 100755 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java @@ -23,7 +23,8 @@ import org.junit.runners.model.Statement; /** * Serializable subclass of {@link org.junit.rules.ExternalResource ExternalResource}. */ -public abstract class SerializableExternalResource extends ExternalResource implements SerializableTestRule { +public abstract class SerializableExternalResource extends ExternalResource + implements SerializableTestRule { public Statement apply(Statement base, Description description) { return statement(base); http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java ---------------------------------------------------------------------- diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java index 3f07421..9251e83 100644 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.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.test.junit.rules.serializable; http://git-wip-us.apache.org/repos/asf/geode/blob/d261061e/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java index 27582a7..478fe67 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java @@ -148,7 +148,8 @@ public class LuceneManagementDUnitTest extends ManagementTestBase { } private LuceneServiceMXBean getMBean() { - ObjectName objectName = MBeanJMXAdapter.getCacheServiceMBeanName(getSystem().getDistributedMember(), "LuceneService"); + ObjectName objectName = MBeanJMXAdapter + .getCacheServiceMBeanName(getSystem().getDistributedMember(), "LuceneService"); assertNotNull(getManagementService().getMBeanInstance(objectName, LuceneServiceMXBean.class)); return getManagementService().getMBeanInstance(objectName, LuceneServiceMXBean.class); } @@ -179,12 +180,13 @@ public class LuceneManagementDUnitTest extends ManagementTestBase { private void createIndexes(String regionName, int numIndexes) { LuceneService luceneService = LuceneServiceProvider.get(getCache()); - for (int i=0; i