http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java deleted file mode 100644 index c61cbd0..0000000 --- a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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 - * - * 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.admin.internal; - -import org.apache.geode.distributed.DistributedSystem; -import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.junit.After; -import org.junit.Before; - -import java.util.Properties; - -import static org.apache.geode.distributed.ConfigurationProperties.*; - -/** - * Superclass of tests for the {@linkplain org.apache.geode.admin.internal.AbstractHealthEvaluator - * health evaluator} classes. - * - * - * @since GemFire 3.5 - */ -public abstract class HealthEvaluatorTestCase { - - /** The DistributedSystem used for this test */ - protected InternalDistributedSystem system; - - /** - * Creates a "loner" <code>DistributedSystem</code> for this test. - */ - @Before - public void setUp() { - Properties props = getProperties(); - system = (InternalDistributedSystem) DistributedSystem.connect(props); - } - - /** - * Closes the "loner" <code>DistributedSystem</code> - */ - @After - public void tearDown() { - if (this.system != null) { - this.system.disconnect(); - } - - this.system = null; - } - - /** - * Creates the <code>Properties</code> objects used to connect to the distributed system. - */ - protected Properties getProperties() { - Properties props = new Properties(); - props.setProperty(MCAST_PORT, "0"); - props.setProperty(LOCATORS, ""); - props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); - - return props; - } - -}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java deleted file mode 100644 index d20ce36..0000000 --- a/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * 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 - * - * 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.admin.internal; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import org.apache.geode.admin.GemFireHealth; -import org.apache.geode.admin.GemFireHealthConfig; -import org.apache.geode.internal.statistics.GemFireStatSampler; -import org.apache.geode.internal.statistics.platform.ProcessStats; -import org.apache.geode.internal.PureJavaMode; -import org.apache.geode.test.junit.categories.IntegrationTest; - -/** - * Contains simple tests for the {@link MemberHealthEvaluator}. - * - * - * @since GemFire 3.5 - */ -@SuppressWarnings("deprecation") -@Category(IntegrationTest.class) -public class MemberHealthEvaluatorJUnitTest extends HealthEvaluatorTestCase { - - /** - * Tests that we are in {@link GemFireHealth#OKAY_HEALTH okay} health if the VM's process size is - * too big. - * - * @see MemberHealthEvaluator#checkVMProcessSize - */ - @Test - public void testCheckVMProcessSize() throws InterruptedException { - if (PureJavaMode.osStatsAreAvailable()) { - GemFireStatSampler sampler = system.getStatSampler(); - assertNotNull(sampler); - - sampler.waitForInitialization(10000); // fix: remove infinite wait - - ProcessStats stats = sampler.getProcessStats(); - assertNotNull(stats); - - List status = new ArrayList(); - long threshold = stats.getProcessSize() * 2; - - if (threshold <= 0) { - // The process size is zero on some Linux versions - return; - } - - GemFireHealthConfig config = new GemFireHealthConfigImpl(null); - config.setMaxVMProcessSize(threshold); - - MemberHealthEvaluator eval = - new MemberHealthEvaluator(config, this.system.getDistributionManager()); - eval.evaluate(status); - assertTrue(status.isEmpty()); - - status = new ArrayList(); - long processSize = stats.getProcessSize(); - threshold = processSize / 2; - assertTrue("Threshold (" + threshold + ") is > 0. " + "Process size is " + processSize, - threshold > 0); - - config = new GemFireHealthConfigImpl(null); - config.setMaxVMProcessSize(threshold); - - eval = new MemberHealthEvaluator(config, this.system.getDistributionManager()); - eval.evaluate(status); - assertEquals(1, status.size()); - - AbstractHealthEvaluator.HealthStatus ill = - (AbstractHealthEvaluator.HealthStatus) status.get(0); - assertEquals(GemFireHealth.OKAY_HEALTH, ill.getHealthCode()); - assertTrue(ill.getDiagnosis().indexOf("The size of this VM") != -1); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java index 5a0d3fc..ade1450 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java @@ -198,7 +198,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { } queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName; try { @@ -212,7 +212,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where ticker = 'ibm'"; try { Query query = qService.newQuery(queryString); @@ -224,7 +224,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where ticker = 'IBM'"; try { Query query = qService.newQuery(queryString); @@ -236,7 +236,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where price > 49"; try { Query query = qService.newQuery(queryString); @@ -248,7 +248,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where price = 50"; try { Query query = qService.newQuery(queryString); @@ -260,7 +260,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { assertTrue(!results.getCollectionType().allowsDuplicates()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName + " where ticker = 'ibm' and price = 50"; try { Query query = qService.newQuery(queryString); @@ -318,7 +318,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { } queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName; try { Query query = qService.newQuery(queryString); @@ -331,7 +331,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where ticker = 'ibm'"; try { Query query = qService.newQuery(queryString); @@ -344,7 +344,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where ticker = 'IBM'"; try { Query query = qService.newQuery(queryString); @@ -357,7 +357,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where price > 49"; try { Query query = qService.newQuery(queryString); @@ -370,7 +370,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where price = 50"; try { Query query = qService.newQuery(queryString); @@ -383,7 +383,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { && results.getCollectionType().getElementType().isStructType()); queryString = - "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName + " where ticker = 'ibm' and price = 50"; try { Query query = qService.newQuery(queryString); @@ -1654,7 +1654,8 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase { } try { - String importString = "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject;"; + String importString = + "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject;"; qService.createIndex("test", IndexType.FUNCTIONAL, "ticker", regionName1, importString); } catch (UnsupportedOperationException e) { // Expected behavior. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java index 1da473f..90c1cd9 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ConsoleDistributionManagerDUnitTest.java @@ -56,8 +56,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.FlakyTest; /** - * This class tests the functionality of the {@linkplain org.apache.geode.internal.admin internal - * admin} API. + * This class tests the functionality of the internal admin API. */ @Category(DistributedTest.class) public class ConsoleDistributionManagerDUnitTest extends JUnit4CacheTestCase http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java index b1478e2..8768929 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java @@ -28,12 +28,12 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.apache.geode.LogWriter; -import org.apache.geode.admin.AdminDistributedSystem; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.Alert; -import org.apache.geode.admin.AlertLevel; -import org.apache.geode.admin.AlertListener; -import org.apache.geode.admin.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.AdminDistributedSystem; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.Alert; +import org.apache.geode.internal.admin.api.AlertLevel; +import org.apache.geode.internal.admin.api.AlertListener; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.DataPolicy; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java index 8134f36..6855dbd 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal; -import org.apache.geode.admin.internal.InetAddressUtil; +import org.apache.geode.internal.admin.api.impl.InetAddressUtil; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.test.junit.categories.IntegrationTest; import org.junit.After; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/AdminTestHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/AdminTestHelper.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/AdminTestHelper.java new file mode 100644 index 0000000..18568ee --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/AdminTestHelper.java @@ -0,0 +1,44 @@ +/* + * 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 + * + * 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.internal.admin.api; + +import static org.junit.Assert.*; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; + +public class AdminTestHelper { + private AdminTestHelper() {} + + public static void checkEnableAdministrationOnly(boolean v, boolean expectException) { + boolean origIsDedicatedAdminVM = DistributionManager.isDedicatedAdminVM; + if (expectException) { + try { + AdminDistributedSystemFactory.setEnableAdministrationOnly(v); + fail("expected IllegalStateException"); + } catch (IllegalStateException expected) { + assertEquals(origIsDedicatedAdminVM, DistributionManager.isDedicatedAdminVM); + } finally { + DistributionManager.isDedicatedAdminVM = origIsDedicatedAdminVM; + } + } else { + try { + AdminDistributedSystemFactory.setEnableAdministrationOnly(v); + assertEquals(v, DistributionManager.isDedicatedAdminVM); + } finally { + DistributionManager.isDedicatedAdminVM = origIsDedicatedAdminVM; + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/AlertLevelJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/AlertLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/AlertLevelJUnitTest.java new file mode 100644 index 0000000..100ce34 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/AlertLevelJUnitTest.java @@ -0,0 +1,64 @@ +/* + * 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 + * + * 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.internal.admin.api; + +import static org.apache.geode.internal.Assert.assertTrue; +import static org.junit.Assert.*; + +import java.lang.reflect.Constructor; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.internal.admin.api.AlertLevel; +import org.apache.geode.test.junit.categories.UnitTest; + +/** + * AlertLevel Tester. + */ +@Category(UnitTest.class) +public class AlertLevelJUnitTest { + + /** + * Method: equals(Object other) + */ + + private AlertLevel alertLevel1 = AlertLevel.WARNING; + private AlertLevel alertLevel2 = AlertLevel.ERROR; + private AlertLevel alertLevel3 = AlertLevel.WARNING; + + + @Test + public void testEquals() throws Exception { + // TODO: Test goes here... + assertTrue(alertLevel1.equals(alertLevel3)); + assertFalse(alertLevel1.equals(alertLevel2)); + assertFalse(alertLevel1.equals(null)); + + Constructor<AlertLevel> constructor; + constructor = AlertLevel.class.getDeclaredConstructor(int.class, String.class); + constructor.setAccessible(true); + AlertLevel level = constructor.newInstance(AlertLevel.ERROR.getSeverity(), "ERROR"); + assertEquals(level.getSeverity(), AlertLevel.ERROR.getSeverity()); + + + AlertLevel level1 = + constructor.newInstance(AlertLevel.ERROR.getSeverity(), new String("ERROR")); + assertEquals(level1.getName(), alertLevel2.getName()); + assertTrue(level1.equals(alertLevel2)); + + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/BindDistributedSystemJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/BindDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/BindDistributedSystemJUnitTest.java new file mode 100755 index 0000000..b342b7d --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/BindDistributedSystemJUnitTest.java @@ -0,0 +1,86 @@ +/* + * 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 + * + * 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.internal.admin.api.impl; + +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.impl.InetAddressUtil; +import org.apache.geode.test.junit.categories.IntegrationTest; +import org.junit.After; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.Properties; + +import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; +import static org.junit.Assert.assertEquals; + +/** + * Tests {@link AdminDistributedSystemImpl}. + * + * @created August 30, 2004 + * @since GemFire 3.5 + */ +@SuppressWarnings("deprecation") +@Category(IntegrationTest.class) +public class BindDistributedSystemJUnitTest { + + private final static int RETRY_ATTEMPTS = 3; + private final static int RETRY_SLEEP = 100; + + private DistributedSystem system; + + @After + public void tearDown() { + if (this.system != null) { + this.system.disconnect(); + } + this.system = null; + } + + // public void testBindToAddressNull() throws Exception { + // DistributedSystemFactory.bindToAddress(null); + // todo... + // } + // + // public void testBindToAddressEmpty() throws Exception { + // DistributedSystemFactory.bindToAddress(""); + // todo... + // } + + @Test + public void testBindToAddressLoopback() throws Exception { + String bindTo = "127.0.0.1"; + // make sure bindTo is the loopback... needs to be later in test... + assertEquals(true, InetAddressUtil.isLoopback(bindTo)); + + Properties props = new Properties(); + props.setProperty(BIND_ADDRESS, bindTo); + props.setProperty(START_LOCATOR, + "localhost[" + AvailablePortHelper.getRandomAvailableTCPPort() + "]"); + this.system = org.apache.geode.distributed.DistributedSystem.connect(props); + + assertEquals(true, this.system.isConnected()); + + // Because of fix for bug 31409 + this.system.disconnect(); + + } + + +} + http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/CacheHealthEvaluatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/CacheHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/CacheHealthEvaluatorJUnitTest.java new file mode 100644 index 0000000..4ccc7c5 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/CacheHealthEvaluatorJUnitTest.java @@ -0,0 +1,200 @@ +/* + * 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 + * + * 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.internal.admin.api.impl; + +import static org.junit.Assert.*; + +import org.apache.geode.cache.*; +import org.apache.geode.internal.admin.api.GemFireHealth; +import org.apache.geode.internal.admin.api.GemFireHealthConfig; +import org.apache.geode.internal.cache.*; +import org.apache.geode.test.junit.categories.IntegrationTest; + +import java.util.*; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; + +/** + * Contains simple tests for the {@link CacheHealthEvaluator} + * + * + * @since GemFire 3.5 + */ +@SuppressWarnings("deprecation") +@Category(IntegrationTest.class) +public class CacheHealthEvaluatorJUnitTest extends HealthEvaluatorTestCase { + + @Rule + public TestName testName = new TestName(); + + /** + * Tests that we are in {@link GemFireHealth#OKAY_HEALTH okay} health if cache loads take too + * long. + * + * @see CacheHealthEvaluator#checkLoadTime + */ + @Test + public void testCheckLoadTime() throws CacheException { + Cache cache = CacheFactory.create(this.system); + CachePerfStats stats = ((GemFireCacheImpl) cache).getCachePerfStats(); + + AttributesFactory factory = new AttributesFactory(); + factory.setScope(Scope.LOCAL); + factory.setCacheLoader(new CacheLoader() { + public Object load(LoaderHelper helper) throws CacheLoaderException { + + return "Loaded"; + } + + public void close() {} + }); + + RegionAttributes attrs = factory.create(); + Region region = cache.createRegion(getName(), attrs); + + GemFireHealthConfig config = new GemFireHealthConfigImpl(null); + config.setMaxLoadTime(100); + + CacheHealthEvaluator eval = + new CacheHealthEvaluator(config, this.system.getDistributionManager()); + for (int i = 0; i < 10; i++) { + region.get("Test1 " + i); + } + long firstLoadTime = stats.getLoadTime(); + long firstLoadsCompleted = stats.getLoadsCompleted(); + assertTrue(firstLoadTime >= 0); + assertTrue(firstLoadsCompleted > 0); + + // First time should always be empty + List status = new ArrayList(); + eval.evaluate(status); + assertEquals(0, status.size()); + + config = new GemFireHealthConfigImpl(null); + config.setMaxLoadTime(10); + eval = new CacheHealthEvaluator(config, this.system.getDistributionManager()); + eval.evaluate(status); + + long start = System.currentTimeMillis(); + for (int i = 0; i < 100; i++) { + region.get("Test2 " + i); + } + assertTrue(System.currentTimeMillis() - start < 1000); + long secondLoadTime = stats.getLoadTime(); + long secondLoadsCompleted = stats.getLoadsCompleted(); + assertTrue("firstLoadTime=" + firstLoadTime + ", secondLoadTime=" + secondLoadTime, + secondLoadTime >= firstLoadTime); + assertTrue(secondLoadsCompleted > firstLoadsCompleted); + + // Averge should be less than 10 milliseconds + status = new ArrayList(); + eval.evaluate(status); + assertEquals(0, status.size()); + + region.getAttributesMutator().setCacheLoader(new CacheLoader() { + public Object load(LoaderHelper helper) throws CacheLoaderException { + + try { + Thread.sleep(20); + + } catch (InterruptedException ex) { + fail("Why was I interrupted?"); + } + return "Loaded"; + } + + public void close() {} + + }); + + for (int i = 0; i < 50; i++) { + region.get("Test3 " + i); + } + + long thirdLoadTime = stats.getLoadTime(); + long thirdLoadsCompleted = stats.getLoadsCompleted(); + assertTrue(thirdLoadTime > secondLoadTime); + assertTrue(thirdLoadsCompleted > secondLoadsCompleted); + + status = new ArrayList(); + eval.evaluate(status); + assertEquals(1, status.size()); + + AbstractHealthEvaluator.HealthStatus ill = (AbstractHealthEvaluator.HealthStatus) status.get(0); + assertEquals(GemFireHealth.OKAY_HEALTH, ill.getHealthCode()); + String s = "The average duration of a Cache load"; + assertTrue(ill.getDiagnosis().indexOf(s) != -1); + } + + /** + * Tests that we are in {@link GemFireHealth#OKAY_HEALTH okay} health if the hit ratio dips below + * the threshold. + */ + @Test + public void testCheckHitRatio() throws CacheException { + Cache cache = CacheFactory.create(this.system); + // CachePerfStats stats = ((GemFireCache) cache).getCachePerfStats(); + + AttributesFactory factory = new AttributesFactory(); + factory.setScope(Scope.LOCAL); + factory.setCacheLoader(new CacheLoader() { + public Object load(LoaderHelper helper) throws CacheLoaderException { + + return "Loaded"; + } + + public void close() {} + }); + + RegionAttributes attrs = factory.create(); + Region region = cache.createRegion(getName(), attrs); + + GemFireHealthConfig config = new GemFireHealthConfigImpl(null); + config.setMinHitRatio(0.5); + + CacheHealthEvaluator eval = + new CacheHealthEvaluator(config, this.system.getDistributionManager()); + List status = new ArrayList(); + eval.evaluate(status); + assertEquals(0, status.size()); + + region.get("One"); + region.get("One"); + region.get("One"); + + status = new ArrayList(); + eval.evaluate(status); + assertEquals(0, status.size()); + + for (int i = 0; i < 50; i++) { + region.get("Miss " + i); + } + + status = new ArrayList(); + eval.evaluate(status); + + AbstractHealthEvaluator.HealthStatus ill = (AbstractHealthEvaluator.HealthStatus) status.get(0); + assertEquals(GemFireHealth.OKAY_HEALTH, ill.getHealthCode()); + String s = "The hit ratio of this Cache"; + assertTrue(ill.getDiagnosis().indexOf(s) != -1); + } + + private String getName() { + return getClass().getSimpleName() + "_" + testName.getMethodName(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/DistributedSystemTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/DistributedSystemTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/DistributedSystemTestCase.java new file mode 100755 index 0000000..fd9212c --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/DistributedSystemTestCase.java @@ -0,0 +1,64 @@ +/* + * 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 + * + * 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.internal.admin.api.impl; + +import org.apache.geode.distributed.DistributedSystem; +import org.junit.After; +import org.junit.Before; + +import java.util.Properties; + +import static org.apache.geode.distributed.ConfigurationProperties.*; + +/** + * Provides common setUp and tearDown for testing the Admin API. + * + * @since GemFire 3.5 + */ +public abstract class DistributedSystemTestCase { + + /** The DistributedSystem used for this test */ + protected DistributedSystem system; + + /** + * Creates a "loner" <code>DistributedSystem</code> for this test. + */ + @Before + public void setUp() throws Exception { + this.system = DistributedSystem.connect(defineProperties()); + } + + /** + * Closes the "loner" <code>DistributedSystem</code> + */ + @After + public void tearDown() throws Exception { + if (this.system != null) { + this.system.disconnect(); + } + this.system = null; + } + + /** + * Defines the <code>Properties</code> used to connect to the distributed system. + */ + protected Properties defineProperties() { + Properties props = new Properties(); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); + props.setProperty(CONSERVE_SOCKETS, "true"); + return props; + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java new file mode 100644 index 0000000..858603f --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/HealthEvaluatorTestCase.java @@ -0,0 +1,72 @@ +/* + * 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 + * + * 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.internal.admin.api.impl; + +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.admin.api.impl.AbstractHealthEvaluator; + +import org.junit.After; +import org.junit.Before; + +import java.util.Properties; + +import static org.apache.geode.distributed.ConfigurationProperties.*; + +/** + * Superclass of tests for the {@linkplain AbstractHealthEvaluator health evaluator} classes. + * + * + * @since GemFire 3.5 + */ +public abstract class HealthEvaluatorTestCase { + + /** The DistributedSystem used for this test */ + protected InternalDistributedSystem system; + + /** + * Creates a "loner" <code>DistributedSystem</code> for this test. + */ + @Before + public void setUp() { + Properties props = getProperties(); + system = (InternalDistributedSystem) DistributedSystem.connect(props); + } + + /** + * Closes the "loner" <code>DistributedSystem</code> + */ + @After + public void tearDown() { + if (this.system != null) { + this.system.disconnect(); + } + + this.system = null; + } + + /** + * Creates the <code>Properties</code> objects used to connect to the distributed system. + */ + protected Properties getProperties() { + Properties props = new Properties(); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, ""); + props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); + + return props; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/MemberHealthEvaluatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/MemberHealthEvaluatorJUnitTest.java new file mode 100644 index 0000000..c45bf00 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/admin/api/impl/MemberHealthEvaluatorJUnitTest.java @@ -0,0 +1,96 @@ +/* + * 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 + * + * 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.internal.admin.api.impl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.internal.admin.api.GemFireHealth; +import org.apache.geode.internal.admin.api.GemFireHealthConfig; +import org.apache.geode.internal.statistics.GemFireStatSampler; +import org.apache.geode.internal.statistics.platform.ProcessStats; +import org.apache.geode.internal.PureJavaMode; +import org.apache.geode.test.junit.categories.IntegrationTest; + +/** + * Contains simple tests for the {@link MemberHealthEvaluator}. + * + * + * @since GemFire 3.5 + */ +@SuppressWarnings("deprecation") +@Category(IntegrationTest.class) +public class MemberHealthEvaluatorJUnitTest extends HealthEvaluatorTestCase { + + /** + * Tests that we are in {@link GemFireHealth#OKAY_HEALTH okay} health if the VM's process size is + * too big. + * + * @see MemberHealthEvaluator#checkVMProcessSize + */ + @Test + public void testCheckVMProcessSize() throws InterruptedException { + if (PureJavaMode.osStatsAreAvailable()) { + GemFireStatSampler sampler = system.getStatSampler(); + assertNotNull(sampler); + + sampler.waitForInitialization(10000); // fix: remove infinite wait + + ProcessStats stats = sampler.getProcessStats(); + assertNotNull(stats); + + List status = new ArrayList(); + long threshold = stats.getProcessSize() * 2; + + if (threshold <= 0) { + // The process size is zero on some Linux versions + return; + } + + GemFireHealthConfig config = new GemFireHealthConfigImpl(null); + config.setMaxVMProcessSize(threshold); + + MemberHealthEvaluator eval = + new MemberHealthEvaluator(config, this.system.getDistributionManager()); + eval.evaluate(status); + assertTrue(status.isEmpty()); + + status = new ArrayList(); + long processSize = stats.getProcessSize(); + threshold = processSize / 2; + assertTrue("Threshold (" + threshold + ") is > 0. " + "Process size is " + processSize, + threshold > 0); + + config = new GemFireHealthConfigImpl(null); + config.setMaxVMProcessSize(threshold); + + eval = new MemberHealthEvaluator(config, this.system.getDistributionManager()); + eval.evaluate(status); + assertEquals(1, status.size()); + + AbstractHealthEvaluator.HealthStatus ill = + (AbstractHealthEvaluator.HealthStatus) status.get(0); + assertEquals(GemFireHealth.OKAY_HEALTH, ill.getHealthCode()); + assertTrue(ill.getDiagnosis().indexOf("The size of this VM") != -1); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java index 10931e1..8ba922c 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java @@ -19,8 +19,6 @@ import org.junit.Test; import static org.junit.Assert.*; -import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; import java.io.BufferedReader; @@ -38,10 +36,8 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.apache.geode.GemFireIOException; -import org.apache.geode.admin.BackupStatus; -import org.apache.geode.admin.internal.FinishBackupRequest; -import org.apache.geode.admin.internal.PrepareBackupRequest; +import org.apache.geode.internal.admin.api.BackupStatus; +import org.apache.geode.internal.admin.api.impl.PrepareBackupRequest; import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.DiskStore; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java index 9c459a9..657a26b 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java @@ -32,12 +32,12 @@ import java.util.Set; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.admin.AdminDistributedSystem; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.AdminException; -import org.apache.geode.admin.BackupStatus; -import org.apache.geode.admin.DistributedSystemConfig; -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.AdminDistributedSystem; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.AdminException; +import org.apache.geode.internal.admin.api.BackupStatus; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java index a044a61..d383eb5 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java @@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.partitioned; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Appender; @@ -34,8 +33,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.mockito.Mockito.times; -import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; import java.io.IOException; @@ -49,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.jayway.awaitility.core.ConditionTimeoutException; -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheClosedException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java index 09893be..4b95d0e 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java @@ -28,11 +28,11 @@ import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.geode.admin.AdminDistributedSystem; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.AdminException; -import org.apache.geode.admin.BackupStatus; -import org.apache.geode.admin.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.AdminDistributedSystem; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.AdminException; +import org.apache.geode.internal.admin.api.BackupStatus; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java index 52d1327..7317217 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.apache.geode.InternalGemFireError; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.AdminException; -import org.apache.geode.admin.DistributedSystemConfig; -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.AdminException; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheClosedException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java index 5f2575d..f501b65 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java @@ -35,10 +35,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.apache.geode.DataSerializer; -import org.apache.geode.admin.AdminDistributedSystem; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.AdminException; -import org.apache.geode.admin.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.AdminDistributedSystem; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.AdminException; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheClosedException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java index a886ff7..1ad7c2f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.InOrder; -import org.apache.geode.admin.internal.BackupDataStoreHelper; -import org.apache.geode.admin.internal.FinishBackupRequest; -import org.apache.geode.admin.internal.PrepareBackupRequest; +import org.apache.geode.internal.admin.api.impl.BackupDataStoreHelper; +import org.apache.geode.internal.admin.api.impl.FinishBackupRequest; +import org.apache.geode.internal.admin.api.impl.PrepareBackupRequest; import org.apache.geode.distributed.internal.DM; import org.apache.geode.distributed.internal.locks.DLockService; import org.apache.geode.internal.cache.GemFireCacheImpl; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java index 838bb29..cf19cb6 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.QueryTestUtils; @@ -44,7 +44,6 @@ import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.DistributionMessageObserver; import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.internal.net.SSLConfigurationFactory; import org.apache.geode.internal.net.SocketCreator; import org.apache.geode.internal.admin.ClientStatsManager; import org.apache.geode.internal.cache.DiskStoreObserver; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 23162e5..2a8e368 100644 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1,27 +1,3 @@ -org/apache/geode/admin/RegionSubRegionSnapshot,2 -fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1 -toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1 - -org/apache/geode/admin/internal/FinishBackupRequest,2 -fromData,33,2a2bb700292a2bb8002ab500022a2bb8002ab500032a2bb8002bb6002cb50004b1 -toData,33,2a2bb7002d2ab400022bb8002e2ab400032bb8002e2ab40004b8002f2bb80030b1 - -org/apache/geode/admin/internal/FinishBackupResponse,2 -fromData,14,2a2bb700042a2bb80005b50003b1 -toData,14,2a2bb700062ab400032bb80007b1 - -org/apache/geode/admin/internal/PrepareBackupResponse,2 -fromData,14,2a2bb700042a2bb80005b50003b1 -toData,14,2a2bb700062ab400032bb80007b1 - -org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2 -fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1 -toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1 - -org/apache/geode/admin/jmx/internal/StatAlertNotification,2 -fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1 -toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1 - org/apache/geode/cache/ExpirationAttributes,2 fromData,22,2a2bb900120100b500022a2bb80013c00014b50004b1 toData,19,2b2ab40002b9001502002ab400042bb80016b1 @@ -199,9 +175,9 @@ fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1 toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1 org/apache/geode/distributed/internal/StartupMessage,3 -fromDataProblem,38,2ab40039c7000e2abb006759b70068b500392ab400392bb60069572ab40039126ab6006957b1 -fromData,293,2a2bb7006b2a2bb8006cb500092a2bb9006d0100b5000c2a2bb9006e0100b5000d2a2bb9006e0100b500112bb9006d01003d033e1d1ca2003e2bb8006f3a042bb9006d010036051904c6000d19040301011505b80070a700183a062ab2007104bd00225903190653b60026b70072840301a7ffc32bb9006d01003e03360415041da200492bb8006f3a052bb8006f3a062bb9006d010036071905c600121906c6000d19051906150703b80073a700183a082ab2007404bd00225903190853b60026b70072840401a7ffb72a2bb80075c00076b500122a2bb9006d0100b500172a2bb8006cb500182a2bb9006e0100b50019bb006059b700613a0419042bb600772a1904b60078b5000a2a1904b60079b5000b2a1904b6007ab5000e2a1904b6007bb5000fb1 -toData,318,2a2bb7004d2ab400092bb8004e2b2ab4000cb9004f02002b2ab4000db9005002002b2ab40011b900500200b800514d2b2cbeb9004f0200033e1d2cbea2001f2c1d32b600522bb800532b2c1d32b60054b9004f0200840301a7ffe1b800554e2b2dbeb9004f020003360415042dbea200782d150432c100569900302d150432c00056b60057b600583a052d150432c00056b60059b600583a062d150432c00056b6005a3607a700272d150432c0005bb6005c3a052d150432c0005bb6005d3a062d150432c0005bb6005e360719052bb8005319062bb800532b1507b9004f0200840401a7ff872ab400122bb8005f2b2ab40017b9004f02002ab400182bb8004e2b2ab40019b900500200bb006059b700613a0419042ab4000ab6006219042ab4000bb6006319042ab4000eb6006419042ab4000fb6006519042bb60066b1 +fromDataProblem,38,2ab40037c7000e2abb006559b70066b500372ab400372bb60067572ab400371268b6006757b1 +fromData,293,2a2bb700692a2bb8006ab500092a2bb9006b0100b5000c2a2bb9006c0100b5000d2a2bb9006c0100b500112bb9006b01003d033e1d1ca2003e2bb8006d3a042bb9006b010036051904c6000d19040301011505b8006ea700183a062ab2006f04bd00205903190653b60024b70070840301a7ffc32bb9006b01003e03360415041da200492bb8006d3a052bb8006d3a062bb9006b010036071905c600121906c6000d19051906150703b80071a700183a082ab2007204bd00205903190853b60024b70070840401a7ffb72a2bb80073c00074b500122a2bb9006b0100b500172a2bb8006ab500182a2bb9006c0100b50019bb005e59b7005f3a0419042bb600752a1904b60076b5000a2a1904b60077b5000b2a1904b60078b5000e2a1904b60079b5000fb1 +toData,318,2a2bb7004b2ab400092bb8004c2b2ab4000cb9004d02002b2ab4000db9004e02002b2ab40011b9004e0200b8004f4d2b2cbeb9004d0200033e1d2cbea2001f2c1d32b600502bb800512b2c1d32b60052b9004d0200840301a7ffe1b800534e2b2dbeb9004d020003360415042dbea200782d150432c100549900302d150432c00054b60055b600563a052d150432c00054b60057b600563a062d150432c00054b600583607a700272d150432c00059b6005a3a052d150432c00059b6005b3a062d150432c00059b6005c360719052bb8005119062bb800512b1507b9004d0200840401a7ff872ab400122bb8005d2b2ab40017b9004d02002ab400182bb8004c2b2ab40019b9004e0200bb005e59b7005f3a0419042ab4000ab6006019042ab4000bb6006119042ab4000eb6006219042ab4000fb6006319042bb60064b1 org/apache/geode/distributed/internal/StartupResponseMessage,3 fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1 @@ -293,8 +269,8 @@ toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab600502bb800982b2ab600 toDataPre_GFE_9_0_0_0,225,2ab600502bb800982b2ab6004fb9009902002ab400062bb8007d033d2ab40029b9007e01009900071c04803d2ab40029b9006d01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009a02002b2ab40011b9009902002b2ab40002b9009902002b2ab40013b9009a02002ab400202bb800802ab400182bb8007d2ab40013100da0000e2ab400192bb8007da7000e2ab40014b8009b2bb8007d2ab4001ec700081247a7000a2ab4001eb600812bb8007d2ab4001ec7000911012ca7000a2ab4001eb60082b800832bb800842b2ab4001b04b80085b1 org/apache/geode/distributed/internal/membership/NetView,2 -fromData,98,2a2bb8006ec0002bb500112a2bb9006f0100b500062a2bb80070b50009b200409a00122ab40009c7000bbb004159b70042bf2abb000a592ab40009b7000bb5000c2a2bb80071b5000e2a2bb80071b500102a2bb80072b500052a2bb80073b50004b1 -toData,60,2ab400112bb800682b2ab40006b9006902002a2ab400092bb7006a2ab4000e2bb8006b2ab400102bb8006b2ab400052bb8006c2ab400042bb8006db1 +fromData,98,2a2bb80070c0002db500132a2bb900710100b500082a2bb80072b5000bb200429a00122ab4000bc7000bbb004359b70044bf2abb000c592ab4000bb7000db5000e2a2bb80073b500102a2bb80073b500122a2bb80074b500052a2bb80075b50004b1 +toData,60,2ab400132bb8006a2b2ab40008b9006b02002a2ab4000b2bb7006c2ab400102bb8006d2ab400122bb8006d2ab400052bb8006e2ab400042bb8006fb1 org/apache/geode/distributed/internal/membership/gms/GMSMember,2 fromData,62,2a2bb600472a2bb900480100b500052a2bb900490100b5003b2a2bb900490100b500072a2bb900480100b500062a2bb8004ab500082a2bb8004bb50009b1 @@ -413,6 +389,30 @@ org/apache/geode/internal/admin/ClientMembershipMessage,2 fromData,32,2a2bb7000d2a2bb8000eb500022a2bb8000eb500032a2bb9000f0100b50004b1 toData,32,2a2bb7000a2ab400022bb8000b2ab400032bb8000b2b2ab40004b9000c0200b1 +org/apache/geode/internal/admin/api/RegionSubRegionSnapshot,2 +fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1 +toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1 + +org/apache/geode/internal/admin/api/impl/FinishBackupRequest,2 +fromData,33,2a2bb700292a2bb8002ab500022a2bb8002ab500032a2bb8002bb6002cb50004b1 +toData,33,2a2bb7002d2ab400022bb8002e2ab400032bb8002e2ab40004b8002f2bb80030b1 + +org/apache/geode/internal/admin/api/impl/FinishBackupResponse,2 +fromData,14,2a2bb700042a2bb80005b50003b1 +toData,14,2a2bb700062ab400032bb80007b1 + +org/apache/geode/internal/admin/api/impl/PrepareBackupResponse,2 +fromData,14,2a2bb700042a2bb80005b50003b1 +toData,14,2a2bb700062ab400032bb80007b1 + +org/apache/geode/internal/admin/api/impl/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2 +fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1 +toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1 + +org/apache/geode/internal/admin/api/jmx/impl/StatAlertNotification,2 +fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1 +toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1 + org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2 fromData,17,2a2bb700102a2bb80011c00012b50007b1 toData,14,2a2bb7000e2ab400072bb8000fb1 @@ -2079,8 +2079,8 @@ fromData,31,2a2bb80019b6001ab500022a2bb8001bb500032a2bb8001cc0001db50004b1 toData,28,2ab40002b800152bb800162ab400032bb800172ab400042bb80018b1 org/apache/geode/management/internal/configuration/domain/XmlEntity,2 -fromData,52,2a2bb8006ab500072a2bb8006bc0006cb500042a2bb8006ab500032a2bb8006ab5001c2a2bb8006ab500062a2bb8006ab50005b1 -toData,49,2ab400072bb800682ab400042bb800692ab400032bb800682ab4001c2bb800682ab400062bb800682ab400052bb80068b1 +fromData,52,2a2bb80065b500072a2bb80066c00067b500042a2bb80065b500032a2bb80065b5001c2a2bb80065b500062a2bb80065b50005b1 +toData,49,2ab400072bb800632ab400042bb800642ab400032bb800632ab4001c2bb800632ab400062bb800632ab400052bb80063b1 org/apache/geode/management/internal/configuration/messages/ConfigurationRequest,2 fromData,73,2a2bb900130100b500052bb9001401003dbb000259b700034e1c9e001f03360415041ca200162d2bb900150100b90009020057840401a7ffea2a2db500042a2bb900140100b50007b1 @@ -2124,7 +2124,7 @@ toData,105,2ab400022bb800112b2ab40003b9001202002b2ab40004b9001202002ab400052bb80 org/apache/geode/pdx/internal/PdxType,2 fromData,109,2a2bb80018b5000c2ab7000e2bb9001901003d2a1c047e99000704a7000403b5000d2a1c057e99000704a7000403b5001b2a2bb9001c0100b5000f2a2bb9001c0100b500102bb8001d3d033e1d1ca2001ebb001459b7001e3a0419042bb6001f2a1904b60015840301a7ffe3b1 -toData,124,2ab4000c2bb8001d033d2ab4000d9900081c0480913d2bb8001e4e2db2001fb600209b000f2ab400189900081c0580913d2b1cb9002102002b2ab4000eb9002202002b2ab4000fb9002202002ab40005b600232bb80024033d1c2ab40005b60023a2001a2ab400051cb60025c000134e2d2bb60026840201a7ffe1b1 +toData,124,2ab4000c2bb80020033d2ab4000d9900081c0480913d2bb800214e2db20022b600239b000f2ab4001b9900081c0580913d2b1cb9002402002b2ab4000fb9002502002b2ab40010b9002502002ab40005b600262bb80027033d1c2ab40005b60026a2001a2ab400051cb60028c000144e2d2bb60029840201a7ffe1b1 org/apache/geode/redis/internal/ByteArrayWrapper,2 fromData,20,2a2bb80006b500022a2ab40002b80003b50004b1 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt index 8167ed3..ba62d55 100644 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt @@ -25,32 +25,6 @@ org/apache/geode/ToDataException,true,-2329606027453879918 org/apache/geode/UncreatedSystemException,true,5424354567878425435 org/apache/geode/UnmodifiableException,true,-1043243260052395455 org/apache/geode/UnstartedSystemException,true,-4285897556527521788 -org/apache/geode/admin/AdminException,true,879398950879472021 -org/apache/geode/admin/AdminXmlException,true,-6848726449157550169 -org/apache/geode/admin/AlertLevel,true,-4752438966587392126,ordinal:int -org/apache/geode/admin/CacheDoesNotExistException,true,-1639933911265729978 -org/apache/geode/admin/GemFireHealth$Health,true,3039539430412151801,healthString:java/lang/String -org/apache/geode/admin/GemFireMemberStatus,true,3389997790525991310,_bindAddress:java/lang/String,_clientHealthStats:java/util/Map,_clientHostNames:java/util/Map,_clientQueueSizes:java/util/Map,_connectedClients:java/util/Set,_connectedIncomingGateways:java/util/Map,_connectedPeers:java/util/Set,_connectedServers:java/util/Set,_freeHeapSize:long,_gatewayHubStatus:java/lang/Object,_gatewayQueueSizes:java/util/Map,_hostAddress:java/net/InetAddress,_isClient:boolean,_isConnected:boolean,_isGatewayHub:boolean,_isLocator:boolean,_isPrimaryGatewayHub:boolean,_isServer:boolean,_locators:java/lang/String,_maximumHeapSize:long,_mcastAddress:java/net/InetAddress,_mcastPort:int,_memberId:java/io/Serializable,_memberName:java/lang/String,_outgoingGateways:java/util/Map,_regionStatuses:java/util/Map,_serverPort:int,_unconnectedServers:java/util/Set,upTime:long -org/apache/geode/admin/OperationCancelledException,true,5474068770227602546 -org/apache/geode/admin/RegionNotFoundException,true,1758668137691463909 -org/apache/geode/admin/RuntimeAdminException,true,-7512771113818634005 -org/apache/geode/admin/SystemMemberType,true,3284366994485749302,ordinal:int -org/apache/geode/admin/UnmodifiableConfigurationException,true,-7653547392992060646 -org/apache/geode/admin/internal/BackupStatusImpl,true,3704162840296921840,backedUpDiskStores:java/util/Map,offlineDiskStores:java/util/Set -org/apache/geode/admin/internal/CacheHealthConfigImpl,false,maxEventQueueSize:long,maxLoadTime:long,maxNetSearchTime:long,minHitRatio:double -org/apache/geode/admin/internal/GemFireHealthConfigImpl,true,-6797673296902808018,hostName:java/lang/String,interval:int -org/apache/geode/admin/internal/MemberHealthConfigImpl,true,3966032573073580490,maxMessageQueueSize:long,maxReplyTimeouts:long,maxRetransmissionRatio:double,maxVMProcessSize:long -org/apache/geode/admin/internal/StatisticImpl,true,3899296873901634399,internalStat:org/apache/geode/internal/admin/Stat -org/apache/geode/admin/jmx/internal/AgentImpl$StartupException,true,6614145962199330348 -org/apache/geode/admin/jmx/internal/AgentLauncher$Status,true,-7758402454664266174,baseName:java/lang/String,exception:java/lang/Throwable,msg:java/lang/String,pid:int,state:int -org/apache/geode/admin/jmx/internal/ConfigAttributeInfo,true,-1918437700841687078,config:org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl -org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl,true,-7822171853906772375,deserialized:boolean -org/apache/geode/admin/jmx/internal/ConnectionNotificationFilterImpl,true,1 -org/apache/geode/admin/jmx/internal/DynamicManagedBean,true,4051924500150228160 -org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl,true,1482719647163239953,delegate:org/apache/geode/admin/GemFireHealthConfig,health:org/apache/geode/admin/GemFireHealth,mbeanName:java/lang/String,modelMBean:javax/management/modelmbean/ModelMBean,objectName:javax/management/ObjectName -org/apache/geode/admin/jmx/internal/ManagedResourceType,true,3752874768667480449,ordinal:int -org/apache/geode/admin/jmx/internal/RefreshNotificationType,true,4376763592395613794,ordinal:int -org/apache/geode/admin/jmx/internal/StatisticAttributeInfo,true,28022387514935560,stat:org/apache/geode/admin/Statistic org/apache/geode/cache/AttributesFactory$RegionAttributesImpl,true,-3663000883567530374,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:org/apache/geode/cache/CacheLoader,cacheWriter:org/apache/geode/cache/CacheWriter,compressor:org/apache/geode/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:org/apache/geode/cache/CustomExpiry,customEntryTimeToLive:org/apache/geode/cache/CustomExpiry,dataPolicy:org/apache/geode/cache/DataPolicy,diskDirs:java/io/File[],diskSizes:int[],diskStoreName:java/lang/String,diskSynchronous:boolean,diskWriteAttributes:org/apache/geode/cache/DiskWriteAttributes,earlyAck:boolean,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:int,entryIdleTimeoutExpirationAction:org/apache/geode/cache/ExpirationAction,entryTimeToLive:int,entryTimeToLiveExpirationAction:org/apache/geode/cache/ExpirationAction,evictionAttributes:org/apache/geode/internal/cache/E victionAttributesImpl,gatewaySenderIds:java/util/Set,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isBucketRegion:boolean,isCloningEnabled:boolean,isLockGrantor:boolean,keyConstraint:java/lang/Class,loadFactor:float,membershipAttributes:org/apache/geode/cache/MembershipAttributes,multicastEnabled:boolean,offHeap:boolean,partitionAttributes:org/apache/geode/cache/PartitionAttributes,poolName:java/lang/String,publisher:boolean,regionIdleTimeout:int,regionIdleTimeoutExpirationAction:org/apache/geode/cache/ExpirationAction,regionTimeToLive:int,regionTimeToLiveExpirationAction:org/apache/geode/cache/ExpirationAction,scope:org/apache/geode/cache/Scope,statisticsEnabled:boolean,subscriptionAttributes:org/apache/geode/cache/SubscriptionAttributes,valueConstraint:java/lang/Class org/apache/geode/cache/CacheClosedException,true,-6479561694497811262 org/apache/geode/cache/CacheException,true,7699432887938858940 @@ -251,6 +225,32 @@ org/apache/geode/internal/SystemAdmin$CombinedResources,false org/apache/geode/internal/admin/CompoundEntrySnapshot,true,5776382582897895718,allUserAttributes:java/util/Set,allValues:java/util/Set,hitRatio:float,hitRatioSum:double,hitResponders:long,lastAccessTime:long,lastModifiedTime:long,name:java/lang/Object,numHits:long,numMisses:long org/apache/geode/internal/admin/CompoundRegionSnapshot,true,6295026394298398004,allCacheLoaders:java/util/Set,allCacheWriters:java/util/Set,allCapControllers:java/util/Set,allConcLevels:java/util/Set,allCustomIdle:java/util/HashSet,allCustomTtl:java/util/HashSet,allDataPolicies:java/util/Set,allEntryIdleTimeout:java/util/Set,allEntryTtl:java/util/Set,allInitialCaps:java/util/Set,allKeyConstraints:java/util/Set,allListeners:java/util/Set,allLoadFactors:java/util/Set,allRegionIdleTimeout:java/util/Set,allRegionTtl:java/util/Set,allScopes:java/util/Set,allStatsEnabled:java/util/Set,allUserAttributes:java/util/Set,allValueConstraints:java/util/Set,hitRatio:float,hitRatioSum:double,hitResponders:long,lastAccessTime:long,lastModifiedTime:long,name:java/lang/String,numHits:long,numMisses:long org/apache/geode/internal/admin/StatAlert,true,5725457607122449170,definitionId:int,time:java/util/Date,values:java/lang/Number[] +org/apache/geode/internal/admin/api/AdminException,true,879398950879472021 +org/apache/geode/internal/admin/api/AdminXmlException,true,-6848726449157550169 +org/apache/geode/internal/admin/api/AlertLevel,true,-4752438966587392126,ordinal:int +org/apache/geode/internal/admin/api/CacheDoesNotExistException,true,-1639933911265729978 +org/apache/geode/internal/admin/api/GemFireHealth$Health,true,3039539430412151801,healthString:java/lang/String +org/apache/geode/internal/admin/api/GemFireMemberStatus,true,3389997790525991310,_bindAddress:java/lang/String,_clientHealthStats:java/util/Map,_clientHostNames:java/util/Map,_clientQueueSizes:java/util/Map,_connectedClients:java/util/Set,_connectedIncomingGateways:java/util/Map,_connectedPeers:java/util/Set,_connectedServers:java/util/Set,_freeHeapSize:long,_gatewayHubStatus:java/lang/Object,_gatewayQueueSizes:java/util/Map,_hostAddress:java/net/InetAddress,_isClient:boolean,_isConnected:boolean,_isGatewayHub:boolean,_isLocator:boolean,_isPrimaryGatewayHub:boolean,_isServer:boolean,_locators:java/lang/String,_maximumHeapSize:long,_mcastAddress:java/net/InetAddress,_mcastPort:int,_memberId:java/io/Serializable,_memberName:java/lang/String,_outgoingGateways:java/util/Map,_regionStatuses:java/util/Map,_serverPort:int,_unconnectedServers:java/util/Set,upTime:long +org/apache/geode/internal/admin/api/OperationCancelledException,true,5474068770227602546 +org/apache/geode/internal/admin/api/RegionNotFoundException,true,1758668137691463909 +org/apache/geode/internal/admin/api/RuntimeAdminException,true,-7512771113818634005 +org/apache/geode/internal/admin/api/SystemMemberType,true,3284366994485749302,ordinal:int +org/apache/geode/internal/admin/api/UnmodifiableConfigurationException,true,-7653547392992060646 +org/apache/geode/internal/admin/api/impl/BackupStatusImpl,true,3704162840296921840,backedUpDiskStores:java/util/Map,offlineDiskStores:java/util/Set +org/apache/geode/internal/admin/api/impl/CacheHealthConfigImpl,false,maxEventQueueSize:long,maxLoadTime:long,maxNetSearchTime:long,minHitRatio:double +org/apache/geode/internal/admin/api/impl/GemFireHealthConfigImpl,true,-6797673296902808018,hostName:java/lang/String,interval:int +org/apache/geode/internal/admin/api/impl/MemberHealthConfigImpl,true,3966032573073580490,maxMessageQueueSize:long,maxReplyTimeouts:long,maxRetransmissionRatio:double,maxVMProcessSize:long +org/apache/geode/internal/admin/api/impl/StatisticImpl,true,3899296873901634399,internalStat:org/apache/geode/internal/admin/Stat +org/apache/geode/internal/admin/api/jmx/impl/AgentImpl$StartupException,true,6614145962199330348 +org/apache/geode/internal/admin/api/jmx/impl/AgentLauncher$Status,true,-7758402454664266174,baseName:java/lang/String,exception:java/lang/Throwable,msg:java/lang/String,pid:int,state:int +org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo,true,-1918437700841687078,config:org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl +org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl,true,-7822171853906772375,deserialized:boolean +org/apache/geode/internal/admin/api/jmx/impl/ConnectionNotificationFilterImpl,true,1 +org/apache/geode/internal/admin/api/jmx/impl/DynamicManagedBean,true,4051924500150228160 +org/apache/geode/internal/admin/api/jmx/impl/GemFireHealthConfigJmxImpl,true,1482719647163239953,delegate:org/apache/geode/internal/admin/api/GemFireHealthConfig,health:org/apache/geode/internal/admin/api/GemFireHealth,mbeanName:java/lang/String,modelMBean:javax/management/modelmbean/ModelMBean,objectName:javax/management/ObjectName +org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType,true,3752874768667480449,ordinal:int +org/apache/geode/internal/admin/api/jmx/impl/RefreshNotificationType,true,4376763592395613794,ordinal:int +org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo,true,28022387514935560,stat:org/apache/geode/internal/admin/api/Statistic org/apache/geode/internal/admin/remote/DistributionLocatorId,true,6587390186971937865,bindAddress:java/lang/String,host:java/net/InetAddress,hostnameForClients:java/lang/String,peerLocator:boolean,port:int,serverLocator:boolean org/apache/geode/internal/admin/remote/EntryValueNodeImpl,false,fields:org/apache/geode/internal/admin/remote/EntryValueNodeImpl[],name:java/lang/String,primitive:boolean,primitiveVal:java/lang/Object,type:java/lang/String org/apache/geode/internal/cache/BackupLock,false,backupDone:java/util/concurrent/locks/Condition,backupThread:java/lang/Thread,isBackingUp:boolean http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java index ba14a91..7664e65 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java @@ -21,10 +21,10 @@ import java.util.Set; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.admin.AdminDistributedSystemFactory; -import org.apache.geode.admin.AdminException; -import org.apache.geode.admin.DistributedSystemConfig; -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; +import org.apache.geode.internal.admin.api.AdminDistributedSystemFactory; +import org.apache.geode.internal.admin.api.AdminException; +import org.apache.geode.internal.admin.api.DistributedSystemConfig; +import org.apache.geode.internal.admin.api.impl.AdminDistributedSystemImpl; import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.CacheObserverAdapter; import org.apache.geode.internal.cache.CacheObserverHolder; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6c305f8/gradle/rat.gradle ---------------------------------------------------------------------- diff --git a/gradle/rat.gradle b/gradle/rat.gradle index 4b4a3cc..5cd11d1 100644 --- a/gradle/rat.gradle +++ b/gradle/rat.gradle @@ -208,7 +208,7 @@ rat { 'geode-pulse/src/main/webapp/scripts/multiselect/prettify.js', // MX4J License - 'geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java' + 'geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MX4JModelMBean.java' ] }
