http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java index 031c855..c3563c7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java @@ -16,46 +16,37 @@ package org.apache.geode.management.internal.cli.functions; import java.util.ArrayList; import java.util.List; -import java.util.StringTokenizer; import org.apache.commons.lang.ArrayUtils; -import org.apache.geode.internal.ClassPathLoader; import org.apache.logging.log4j.Logger; import org.apache.geode.SystemFailure; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheClosedException; -import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.InternalEntity; +import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.internal.DeployedJar; +import org.apache.geode.internal.InternalEntity; import org.apache.geode.internal.JarDeployer; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.logging.LogService; public class UndeployFunction implements Function, InternalEntity { - private static final Logger logger = LogService.getLogger(); - - public static final String ID = UndeployFunction.class.getName(); - private static final long serialVersionUID = 1L; - - private InternalCache getCache() { - return (InternalCache) CacheFactory.getAnyInstance(); - } + private static final Logger logger = LogService.getLogger(); @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { // Declared here so that it's available when returning a Throwable String memberId = ""; try { - final Object[] args = (Object[]) context.getArguments(); - final String[] jarFilenameList = (String[]) args[0]; // Comma separated - InternalCache cache = getCache(); + Object[] args = (Object[]) context.getArguments(); + String[] jarFilenameList = (String[]) args[0]; // Comma separated + Cache cache = context.getCache(); - final JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer(); + JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer(); DistributedMember member = cache.getDistributedSystem().getDistributedMember(); @@ -67,8 +58,9 @@ public class UndeployFunction implements Function, InternalEntity { String[] undeployedJars = new String[0]; if (ArrayUtils.isEmpty(jarFilenameList)) { - final List<DeployedJar> jarClassLoaders = jarDeployer.findDeployedJars(); + List<DeployedJar> jarClassLoaders = jarDeployer.findDeployedJars(); undeployedJars = new String[jarClassLoaders.size() * 2]; + int index = 0; for (DeployedJar jarClassLoader : jarClassLoaders) { undeployedJars[index++] = jarClassLoader.getJarName(); @@ -80,8 +72,9 @@ public class UndeployFunction implements Function, InternalEntity { undeployedJars[index++] = iaex.getMessage(); } } + } else { - List<String> undeployedList = new ArrayList<String>(); + List<String> undeployedList = new ArrayList<>(); for (String jarFilename : jarFilenameList) { try { undeployedList.add(jarFilename); @@ -114,11 +107,6 @@ public class UndeployFunction implements Function, InternalEntity { } @Override - public String getId() { - return ID; - } - - @Override public boolean hasResult() { return true; } @@ -132,4 +120,5 @@ public class UndeployFunction implements Function, InternalEntity { public boolean isHA() { return false; } + }
http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java index 18e16ac..80c670d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java @@ -14,44 +14,29 @@ */ package org.apache.geode.management.internal.cli.functions; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.InternalEntity; -import org.apache.geode.internal.admin.remote.ShutdownAllRequest; /** - * * Class for Unregister function - * - * - * */ - - public class UnregisterFunction implements Function, InternalEntity { - public static final String ID = UnregisterFunction.class.getName(); private static final long serialVersionUID = 1L; @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { Object[] args = (Object[]) context.getArguments(); String functionId = (String) args[0]; + try { FunctionService.unregisterFunction(functionId); + context.getResultSender().lastResult("Succeeded in unregistering"); + } catch (Exception e) { context.getResultSender().lastResult("Failed in unregistering " + e.getMessage()); } - context.getResultSender().lastResult("Succeeded in unregistering"); - } - - @Override - public String getId() { - return UnregisterFunction.ID; - } @Override http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java index 1f9a607..e95a16f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Set; import org.apache.geode.cache.Cache; -import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; @@ -33,20 +32,18 @@ import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.i18n.CliStrings; /** - * * @since GemFire 7.0 */ public class UserFunctionExecution implements Function, InternalEntity { - public static final String ID = UserFunctionExecution.class.getName(); - private static final long serialVersionUID = 1L; @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { try { - Cache cache = CacheFactory.getAnyInstance(); + Cache cache = context.getCache(); DistributedMember member = cache.getDistributedSystem().getDistributedMember(); String[] functionArgs = null; + Object[] args = (Object[]) context.getArguments(); if (args != null) { String functionId = ((String) args[0]); @@ -115,6 +112,7 @@ public class UserFunctionExecution implements Function, InternalEntity { } } context.getResultSender().lastResult(resultMessage); + } else { context.getResultSender() .lastResult(CliStrings.format( @@ -129,12 +127,14 @@ public class UserFunctionExecution implements Function, InternalEntity { .lastResult(CliStrings.format( CliStrings.EXECUTE_FUNCTION__MSG__RESULT_COLLECTOR_0_NOT_FOUND_ERROR_1, resultCollectorName, e.getMessage())); + } catch (Exception e) { context.getResultSender() .lastResult(CliStrings.format( CliStrings.EXECUTE_FUNCTION__MSG__ERROR_IN_EXECUTING_ON_MEMBER_1_DETAILS_2, functionId, member.getId(), e.getMessage())); } + } else { context.getResultSender() .lastResult(CliStrings.EXECUTE_FUNCTION__MSG__COULD_NOT_RETRIEVE_ARGUMENTS); @@ -146,11 +146,6 @@ public class UserFunctionExecution implements Function, InternalEntity { } @Override - public String getId() { - return UserFunctionExecution.ID; - } - - @Override public boolean hasResult() { return true; } http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/TimeParser.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/TimeParser.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/TimeParser.java new file mode 100644 index 0000000..a6603fd --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/TimeParser.java @@ -0,0 +1,47 @@ +/* + * 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.management.internal.cli.util; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; + +import org.apache.geode.management.internal.cli.commands.ExportLogsCommand; + +/** + * Extracted from {@link org.apache.geode.management.internal.cli.functions.ExportLogsFunction}. + */ +public class TimeParser { + + public static LocalDateTime parseTime(String dateString) { + if (dateString == null) { + return null; + } + + try { + SimpleDateFormat df = new SimpleDateFormat(ExportLogsCommand.FORMAT); + return df.parse(dateString).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + } catch (ParseException e) { + try { + SimpleDateFormat df = new SimpleDateFormat(ExportLogsCommand.ONLY_DATE_FORMAT); + return df.parse(dateString).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + } catch (ParseException e1) { + return null; + } + } + } +} http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java index 4c1f2cb..9d6ff52 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java @@ -48,7 +48,6 @@ import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.apache.geode.cache.wan.GatewaySender; -import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.lang.Filter; @@ -204,8 +203,8 @@ public class DescribeDiskStoreFunctionJUnitTest { return cacheServerDetails; } - private DescribeDiskStoreFunction createDescribeDiskStoreFunction(final Cache cache) { - return new TestDescribeDiskStoreFunction(cache); + private DescribeDiskStoreFunction createDescribeDiskStoreFunction() { + return new DescribeDiskStoreFunction(); } private File[] createFileArray(final String... locations) { @@ -520,6 +519,8 @@ public class DescribeDiskStoreFunctionJUnitTest { will(returnValue(diskStoreName)); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); @@ -535,7 +536,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final Set<DiskStoreDetails.AsyncEventQueueDetails> expectedAsyncEventQueueDetails = setupAsyncEventQueuesForTestExecute(mockCache, diskStoreName); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.execute(mockFunctionContext); @@ -585,32 +586,6 @@ public class DescribeDiskStoreFunctionJUnitTest { } @Test - public void testExecuteOnMemberHavingANonGemFireCache() throws Throwable { - final Cache mockCache = mockContext.mock(Cache.class, "Cache"); - - final FunctionContext mockFunctionContext = - mockContext.mock(FunctionContext.class, "FunctionContext"); - - final TestResultSender testResultSender = new TestResultSender(); - - mockContext.checking(new Expectations() { - { - exactly(0).of(mockFunctionContext).getResultSender(); - will(returnValue(testResultSender)); - } - }); - - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); - - function.execute(mockFunctionContext); - - final List<?> results = testResultSender.getResults(); - - assertNotNull(results); - assertTrue(results.isEmpty()); - } - - @Test public void testExecuteThrowingDiskStoreNotFoundException() throws Exception { final String diskStoreName = "testDiskStore"; final String memberId = "mockMemberId"; @@ -640,10 +615,12 @@ public class DescribeDiskStoreFunctionJUnitTest { will(returnValue(diskStoreName)); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.execute(mockFunctionContext); @@ -683,10 +660,12 @@ public class DescribeDiskStoreFunctionJUnitTest { will(returnValue(diskStoreName)); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.execute(mockFunctionContext); @@ -740,10 +719,12 @@ public class DescribeDiskStoreFunctionJUnitTest { will(returnValue(diskStoreName)); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.execute(mockFunctionContext); @@ -769,7 +750,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(expectedDiskStoreName, function.getDiskStoreName(mockRegion)); } @@ -789,7 +770,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(DiskStoreDetails.DEFAULT_DISK_STORE_NAME, function.getDiskStoreName(mockRegion)); } @@ -813,7 +794,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isOverflowToDisk(mockRegion)); } @@ -837,7 +818,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isOverflowToDisk(mockRegion)); } @@ -857,7 +838,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isOverflowToDisk(mockRegion)); } @@ -877,7 +858,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isPersistent(mockRegion)); } @@ -897,7 +878,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isPersistent(mockRegion)); } @@ -917,7 +898,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isPersistent(mockRegion)); } @@ -937,7 +918,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isPersistent(mockRegion)); } @@ -957,7 +938,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isPersistent(mockRegion)); } @@ -977,7 +958,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isPersistent(mockRegion)); } @@ -1002,7 +983,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockRegion, mockDiskStore)); } @@ -1029,7 +1010,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockRegion, mockDiskStore)); } @@ -1062,7 +1043,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockRegion, mockDiskStore)); } @@ -1087,7 +1068,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isUsingDiskStore(mockRegion, mockDiskStore)); } @@ -1237,7 +1218,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails(diskStoreName, "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setRegionDetails(mockCache, mockDiskStore, diskStoreDetails); @@ -1261,7 +1242,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(expectedDiskStoreName, function.getDiskStoreName(mockCacheServer)); } @@ -1281,7 +1262,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(DiskStoreDetails.DEFAULT_DISK_STORE_NAME, function.getDiskStoreName(mockCacheServer)); @@ -1298,7 +1279,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertNull(function.getDiskStoreName(mockCacheServer)); } @@ -1323,7 +1304,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockCacheServer, mockDiskStore)); } @@ -1346,7 +1327,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isUsingDiskStore(mockCacheServer, mockDiskStore)); } @@ -1369,7 +1350,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockCacheServer, mockDiskStore)); } @@ -1421,7 +1402,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails(diskStoreName, "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setCacheServerDetails(mockCache, mockDiskStore, diskStoreDetails); @@ -1441,7 +1422,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(expectedDiskStoreName, function.getDiskStoreName(mockGatewaySender)); } @@ -1457,7 +1438,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(DiskStoreDetails.DEFAULT_DISK_STORE_NAME, function.getDiskStoreName(mockGatewaySender)); @@ -1474,7 +1455,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isPersistent(mockGatewaySender)); } @@ -1490,7 +1471,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isPersistent(mockGatewaySender)); } @@ -1512,7 +1493,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockGatewaySender, mockDiskStore)); } @@ -1532,7 +1513,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isUsingDiskStore(mockGatewaySender, mockDiskStore)); } @@ -1552,7 +1533,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockGatewaySender, mockDiskStore)); } @@ -1578,7 +1559,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails(diskStoreName, "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setPdxSerializationDetails(mockCache, mockDiskStore, diskStoreDetails); @@ -1604,7 +1585,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails("testDiskStore", "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setPdxSerializationDetails(mockCache, mockDiskStore, diskStoreDetails); @@ -1626,7 +1607,7 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails("testDiskStore", "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setPdxSerializationDetails(mockCache, mockDiskStore, diskStoreDetails); @@ -1646,7 +1627,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(expectedDiskStoreName, function.getDiskStoreName(mockQueue)); } @@ -1662,7 +1643,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertEquals(DiskStoreDetails.DEFAULT_DISK_STORE_NAME, function.getDiskStoreName(mockQueue)); } @@ -1686,7 +1667,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockQueue, mockDiskStore)); } @@ -1708,7 +1689,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isUsingDiskStore(mockQueue, mockDiskStore)); } @@ -1728,7 +1709,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertFalse(function.isUsingDiskStore(mockQueue, mockDiskStore)); } @@ -1750,7 +1731,7 @@ public class DescribeDiskStoreFunctionJUnitTest { } }); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(null); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); assertTrue(function.isUsingDiskStore(mockQueue, mockDiskStore)); } @@ -1793,27 +1774,13 @@ public class DescribeDiskStoreFunctionJUnitTest { final DiskStoreDetails diskStoreDetails = new DiskStoreDetails(diskStoreName, "memberOne"); - final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(mockCache); + final DescribeDiskStoreFunction function = createDescribeDiskStoreFunction(); function.setAsyncEventQueueDetails(mockCache, mockDiskStore, diskStoreDetails); assertAsyncEventQueueDetails(expectedAsyncEventQueueDetails, diskStoreDetails); } - private static class TestDescribeDiskStoreFunction extends DescribeDiskStoreFunction { - - private final Cache cache; - - public TestDescribeDiskStoreFunction(final Cache cache) { - this.cache = cache; - } - - @Override - protected Cache getCache() { - return this.cache; - } - } - private static class TestResultSender implements ResultSender { private final List<Object> results = new LinkedList<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java index a8b9193..67c9503 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java @@ -34,11 +34,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; -import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.DiskStoreImpl; import org.apache.geode.internal.cache.InternalCache; @@ -85,8 +83,8 @@ public class ListDiskStoresFunctionJUnitTest { return new DiskStoreDetails(id, name, memberId, memberName); } - private ListDiskStoresFunction createListDiskStoresFunction(final Cache cache) { - return new TestListDiskStoresFunction(cache); + private ListDiskStoresFunction createListDiskStoresFunction() { + return new ListDiskStoresFunction(); } @Test @@ -144,10 +142,12 @@ public class ListDiskStoresFunctionJUnitTest { will(returnValue("ds-persistence")); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListDiskStoresFunction function = createListDiskStoresFunction(mockCache); + final ListDiskStoresFunction function = createListDiskStoresFunction(); function.execute(mockFunctionContext); @@ -171,13 +171,7 @@ public class ListDiskStoresFunctionJUnitTest { final FunctionContext mockFunctionContext = mockContext.mock(FunctionContext.class, "MockFunctionContext"); - final ListDiskStoresFunction testListDiskStoresFunction = - new TestListDiskStoresFunction(mockContext.mock(Cache.class, "MockCache")) { - @Override - protected Cache getCache() { - throw new CacheClosedException("Expected"); - } - }; + final ListDiskStoresFunction testListDiskStoresFunction = new ListDiskStoresFunction(); final TestResultSender testResultSender = new TestResultSender(); @@ -185,6 +179,9 @@ public class ListDiskStoresFunctionJUnitTest { { oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + + allowing(mockFunctionContext).getCache(); + will(throwException(new CacheClosedException("Expected"))); } }); @@ -219,10 +216,12 @@ public class ListDiskStoresFunctionJUnitTest { will(returnValue(Collections.emptyList())); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListDiskStoresFunction function = createListDiskStoresFunction(mockCache); + final ListDiskStoresFunction function = createListDiskStoresFunction(); function.execute(mockFunctionContext); @@ -240,7 +239,7 @@ public class ListDiskStoresFunctionJUnitTest { @Test @SuppressWarnings("unchecked") public void testExecuteOnMemberWithANonGemFireCache() throws Throwable { - final Cache mockCache = mockContext.mock(Cache.class, "Cache"); + final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache"); final FunctionContext mockFunctionContext = mockContext.mock(FunctionContext.class, "FunctionContext"); @@ -251,10 +250,14 @@ public class ListDiskStoresFunctionJUnitTest { { oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); + allowing(mockCache).getMyId(); + allowing(mockCache).listDiskStoresIncludingRegionOwned(); } }); - final ListDiskStoresFunction function = createListDiskStoresFunction(mockCache); + final ListDiskStoresFunction function = createListDiskStoresFunction(); function.execute(mockFunctionContext); @@ -289,10 +292,12 @@ public class ListDiskStoresFunctionJUnitTest { will(throwException(new RuntimeException("expected"))); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListDiskStoresFunction function = createListDiskStoresFunction(mockCache); + final ListDiskStoresFunction function = createListDiskStoresFunction(); function.execute(mockFunctionContext); @@ -305,21 +310,6 @@ public class ListDiskStoresFunctionJUnitTest { } } - private static class TestListDiskStoresFunction extends ListDiskStoresFunction { - - private final Cache cache; - - public TestListDiskStoresFunction(final Cache cache) { - assert cache != null : "The Cache cannot be null!"; - this.cache = cache; - } - - @Override - protected Cache getCache() { - return cache; - } - } - private static class TestResultSender implements ResultSender { private final List<Object> results = new LinkedList<Object>(); http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java index 583aa56..335598c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java @@ -155,8 +155,8 @@ public class ListIndexFunctionJUnitTest { return indexStatisticsDetails; } - private ListIndexFunction createListIndexFunction(final Cache cache) { - return new TestListIndexFunction(cache); + private ListIndexFunction createListIndexFunction() { + return new ListIndexFunction(); } private Index createMockIndex(final IndexDetails indexDetails) { @@ -297,10 +297,12 @@ public class ListIndexFunctionJUnitTest { createMockIndex(indexDetailsThree), createMockIndex(indexDetailsFour)))); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListIndexFunction function = createListIndexFunction(mockCache); + final ListIndexFunction function = createListIndexFunction(); function.execute(mockFunctionContext); @@ -357,10 +359,12 @@ public class ListIndexFunctionJUnitTest { will(returnValue(Collections.emptyList())); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListIndexFunction function = createListIndexFunction(mockCache); + final ListIndexFunction function = createListIndexFunction(); function.execute(mockFunctionContext); @@ -403,10 +407,12 @@ public class ListIndexFunctionJUnitTest { will(throwException(new RuntimeException("expected"))); oneOf(mockFunctionContext).getResultSender(); will(returnValue(testResultSender)); + allowing(mockFunctionContext).getCache(); + will(returnValue(mockCache)); } }); - final ListIndexFunction function = createListIndexFunction(mockCache); + final ListIndexFunction function = createListIndexFunction(); function.execute(mockFunctionContext); @@ -419,21 +425,6 @@ public class ListIndexFunctionJUnitTest { } } - private static class TestListIndexFunction extends ListIndexFunction { - - private final Cache cache; - - protected TestListIndexFunction(final Cache cache) { - assert cache != null : "The Cache cannot be null!"; - this.cache = cache; - } - - @Override - protected Cache getCache() { - return this.cache; - } - } - private static class TestResultSender implements ResultSender { private final List<Object> results = new LinkedList<Object>(); http://git-wip-us.apache.org/repos/asf/geode/blob/75b06ac0/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 d627da9..d9d8f1e 100755 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt @@ -248,7 +248,6 @@ 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/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/BucketAdvisor$SetFromMap,true,2454657854757543876,m:java/util/Map org/apache/geode/internal/cache/BucketNotFoundException,true,2898657229184289911 @@ -447,7 +446,6 @@ org/apache/geode/internal/process/PidUnavailableException,true,-1660269538268828 org/apache/geode/internal/process/signal/Signal,false,description:java/lang/String,name:java/lang/String,number:int,type:org/apache/geode/internal/process/signal/SignalType org/apache/geode/internal/process/signal/SignalEvent,false,signal:org/apache/geode/internal/process/signal/Signal org/apache/geode/internal/process/signal/SignalType,false,description:java/lang/String -org/apache/geode/internal/security/SecurityServiceType,false org/apache/geode/internal/sequencelog/GraphType,false org/apache/geode/internal/sequencelog/model/GraphID,false,graphName:java/lang/String,type:org/apache/geode/internal/sequencelog/GraphType org/apache/geode/internal/size/ReflectionObjectSizer,false @@ -540,9 +538,6 @@ org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction, org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction,true,1 org/apache/geode/management/internal/cli/functions/CreateIndexFunction,true,1 org/apache/geode/management/internal/cli/functions/DataCommandFunction,true,1,optimizeForWrite:boolean -org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectExecStep,true,1 -org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectMoveStep,true,1 -org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectQuitStep,true,1 org/apache/geode/management/internal/cli/functions/DeployFunction,true,1 org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction,false org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction,true,1 @@ -574,10 +569,9 @@ org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction,false org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction,true,1 org/apache/geode/management/internal/cli/functions/ListFunctionFunction,true,1 org/apache/geode/management/internal/cli/functions/ListIndexFunction,false -org/apache/geode/management/internal/cli/functions/MemberRegionFunction,true,1 org/apache/geode/management/internal/cli/functions/MembersForRegionFunction,true,8746830191680509335 org/apache/geode/management/internal/cli/functions/NetstatFunction,true,1 -org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionArgument,true,1,lineSeparator:java/lang/String,withlsof:boolean +org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionArgument,true,1,lineSeparator:java/lang/String,withLsof:boolean org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionResult,true,1,compressedBytes:org/apache/geode/management/internal/cli/CliUtil$DeflaterInflaterData,headerInfo:java/lang/String,host:java/lang/String org/apache/geode/management/internal/cli/functions/RebalanceFunction,true,1 org/apache/geode/management/internal/cli/functions/RegionAlterFunction,true,-4846425364943216425 @@ -594,9 +588,6 @@ org/apache/geode/management/internal/cli/functions/UndeployFunction,true,1 org/apache/geode/management/internal/cli/functions/UnregisterFunction,true,1 org/apache/geode/management/internal/cli/functions/UserFunctionExecution,true,1 org/apache/geode/management/internal/cli/json/GfJsonException,true,36449998984143318 -org/apache/geode/management/internal/cli/multistep/CLIMultiStepHelper$RemoteStep,false,commandArguments:java/lang/Object[],name:java/lang/String -org/apache/geode/management/internal/cli/multistep/CLIMultiStepHelper$StepExecutionException,true,1,message:java/lang/String -org/apache/geode/management/internal/cli/multistep/CLIStepExecption,false,result:org/apache/geode/management/cli/Result org/apache/geode/management/internal/cli/result/CommandResultException,true,1,result:org/apache/geode/management/cli/Result org/apache/geode/management/internal/cli/result/ResultDataException,true,3851919811942980944 org/apache/geode/management/internal/cli/result/TableBuilder$Align,false
