Fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/44cd213f Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/44cd213f Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/44cd213f Branch: refs/heads/feature/GEODE-3299 Commit: 44cd213f40dcfd658c581b51c64ed5510ff3f0ba Parents: c3c639d Author: Kirk Lund <[email protected]> Authored: Mon Jul 24 13:07:00 2017 -0700 Committer: Kirk Lund <[email protected]> Committed: Tue Jul 25 14:38:42 2017 -0700 ---------------------------------------------------------------------- .../CreateAlterDestroyRegionCommands.java | 4 +- .../internal/cli/commands/WanCommands.java | 4 +- .../functions/AlterRuntimeConfigFunction.java | 2 - .../functions/AsyncEventQueueFunctionArgs.java | 1 - .../cli/functions/ChangeLogLevelFunction.java | 2 - .../cli/functions/CliFunctionResult.java | 4 +- .../functions/CloseDurableClientFunction.java | 1 - .../cli/functions/CloseDurableCqFunction.java | 1 - .../cli/functions/ContinuousQueryFunction.java | 5 +-- .../CreateAsyncEventQueueFunction.java | 6 +-- .../functions/CreateDefinedIndexesFunction.java | 1 - .../cli/functions/CreateDiskStoreFunction.java | 2 - .../cli/functions/CreateIndexFunction.java | 5 +-- .../cli/functions/DataCommandFunction.java | 25 ++++++++----- .../internal/cli/functions/DeployFunction.java | 10 ++--- .../functions/DescribeDiskStoreFunction.java | 39 ++++++++++---------- .../cli/functions/DestroyDiskStoreFunction.java | 8 ++-- .../cli/functions/DestroyIndexFunction.java | 7 ++-- .../cli/functions/ExportConfigFunction.java | 10 +++-- .../cli/functions/ExportDataFunction.java | 11 +++--- .../cli/functions/ExportLogsFunction.java | 31 +++++++--------- .../FetchRegionAttributesFunction.java | 15 ++++---- .../FetchSharedConfigurationStatusFunction.java | 3 +- .../functions/GarbageCollectionFunction.java | 4 +- .../GatewayReceiverCreateFunction.java | 28 +++++++++----- .../functions/GatewayReceiverFunctionArgs.java | 7 ++-- .../functions/GatewaySenderCreateFunction.java | 23 ++++++++---- .../functions/GatewaySenderDestroyFunction.java | 5 +-- .../internal/cli/util/TimeParser.java | 22 +++++------ 29 files changed, 143 insertions(+), 143 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java index ba67fc7..edc83f8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java @@ -866,8 +866,8 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand { return false; } - private <K, V> FetchRegionAttributesFunctionResult<K, V> getRegionAttributes( - InternalCache cache, String regionPath) { + private <K, V> FetchRegionAttributesFunctionResult<K, V> getRegionAttributes(InternalCache cache, + String regionPath) { if (!isClusterWideSameConfig(cache, regionPath)) { throw new IllegalStateException(CliStrings.format( CliStrings.CREATE_REGION__MSG__USE_ATTRIBUTES_FORM_REGIONS_EXISTS_BUT_DIFFERENT_SCOPE_OR_DATAPOLICY_USE_DESCRIBE_REGION_FOR_0, http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java index 4e4c92e..5590289 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java @@ -562,8 +562,8 @@ public class WanCommands implements GfshCommand { } ResultCollector<?, ?> resultCollector = - CliUtil.executeFunction(new GatewayReceiverCreateFunction(), - gatewayReceiverFunctionArgs, membersToCreateGatewayReceiverOn); + CliUtil.executeFunction(new GatewayReceiverCreateFunction(), gatewayReceiverFunctionArgs, + membersToCreateGatewayReceiverOn); @SuppressWarnings("unchecked") List<CliFunctionResult> gatewayReceiverCreateResults = (List<CliFunctionResult>) resultCollector.getResult(); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java index b6c6c5a..3beca94 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java @@ -32,9 +32,7 @@ import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.i18n.CliStrings; public class AlterRuntimeConfigFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; - private static Logger logger = LogService.getLogger(); @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs.java index fb5fbab..2a67270 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs.java @@ -21,7 +21,6 @@ import java.util.Properties; * This class stores the arguments provided for create async event queue command. */ public class AsyncEventQueueFunctionArgs implements Serializable { - private static final long serialVersionUID = -6524494645663740872L; private final String asyncEventQueueId; http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java index 5fd3348..1961f0a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction.java @@ -38,9 +38,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterLogger; * since 8.0 */ public class ChangeLogLevelFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; - private static final Logger logger = LogService.getLogger(); @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java index 4bc7acc..7c6ce3c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java @@ -28,6 +28,7 @@ import org.apache.geode.internal.DataSerializableFixedID; import org.apache.geode.internal.Version; import org.apache.geode.management.internal.configuration.domain.XmlEntity; +// TODO: make CliFunctionResult immutable public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSerializableFixedID { private String memberIdOrName; @@ -158,7 +159,8 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer this.byteData = DataSerializer.readByteArray(in); } - public void fromDataPre_GFE_8_0_0_0(final DataInput in) throws IOException, ClassNotFoundException { + public void fromDataPre_GFE_8_0_0_0(final DataInput in) + throws IOException, ClassNotFoundException { this.memberIdOrName = DataSerializer.readString(in); this.throwable = DataSerializer.readObject(in); this.serializables = (Serializable[]) DataSerializer.readObjectArray(in); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction.java index 6af9d50..4918544 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction.java @@ -28,7 +28,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; * Function to close a durable client */ public class CloseDurableClientFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction.java index ab925de..6793028 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction.java @@ -28,7 +28,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; * Function to close a durable cq */ public class CloseDurableCqFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java index b03d00a..2810b16 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction.java @@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection; * @since GemFire 8.0 */ public class ContinuousQueryFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; @Override @@ -120,14 +119,14 @@ public class ContinuousQueryFunction implements Function, InternalEntity { } public class ClientInfo implements Serializable { - private static final long serialVersionUID = 1L; public final String isDurable; public final String primaryServer; public final String secondaryServer; - public ClientInfo(final String isClientDurable, final String primaryServerId, final String secondaryServerId) { + public ClientInfo(final String isClientDurable, final String primaryServerId, + final String secondaryServerId) { isDurable = isClientDurable; primaryServer = primaryServerId; secondaryServer = secondaryServerId; http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java index 5461a49..a76df15 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java @@ -48,9 +48,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; * @since GemFire 8.0 */ public class CreateAsyncEventQueueFunction implements InternalEntity, Function { - private static final Logger logger = LogService.getLogger(); - private static final long serialVersionUID = 1L; @Override @@ -142,7 +140,7 @@ public class CreateAsyncEventQueueFunction implements InternalEntity, Function { } } - private Class<?> forName(String className, String neededFor) { + private Class<?> forName(final String className, final String neededFor) { if (Strings.isNullOrEmpty(className)) { return null; } @@ -160,7 +158,7 @@ public class CreateAsyncEventQueueFunction implements InternalEntity, Function { } } - private static Object newInstance(Class<?> klass, String neededFor) { + private static Object newInstance(final Class<?> klass, final String neededFor) { try { return klass.newInstance(); } catch (InstantiationException e) { http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction.java index 47017f0..a026085 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction.java @@ -27,7 +27,6 @@ import org.apache.geode.management.internal.cli.domain.IndexInfo; import org.apache.geode.management.internal.cli.i18n.CliStrings; public class CreateDefinedIndexesFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java index 9ade960..85b8e98 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java @@ -35,9 +35,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; * @since GemFire 8.0 */ public class CreateDiskStoreFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; - private static final Logger logger = LogService.getLogger(); @Override http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateIndexFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateIndexFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateIndexFunction.java index cac6246..897bd0d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateIndexFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateIndexFunction.java @@ -32,7 +32,6 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; * Function to create index in a member, based on different arguments passed to it */ public class CreateIndexFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override @@ -94,8 +93,8 @@ public class CreateIndexFunction implements InternalEntity, Function { } } - private void setResultInSender(final FunctionContext context, final IndexInfo indexInfo, final String memberId, - final Cache cache, final String regionPath) { + private void setResultInSender(final FunctionContext context, final IndexInfo indexInfo, + final String memberId, final Cache cache, final String regionPath) { if (regionPath == null) { String message = CliStrings.format(CliStrings.CREATE_INDEX__INVALID__REGIONPATH, indexInfo.getRegionPath()); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java index 0483838..6a0d3e9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java @@ -137,7 +137,8 @@ public class DataCommandFunction implements InternalEntity, Function { return remove(key, keyClass, regionName, removeAllKeys); } - private DataCommandResult get(final DataCommandRequest request, final SecurityService securityService) { + private DataCommandResult get(final DataCommandRequest request, + final SecurityService securityService) { String key = request.getKey(); String keyClass = request.getKeyClass(); String valueClass = request.getValueClass(); @@ -249,7 +250,8 @@ public class DataCommandFunction implements InternalEntity, Function { } private void select_SelectResults(final SelectResults selectResults, final Object principal, - final List<SelectResultRow> list, final AtomicInteger nestedObjectCount) throws GfJsonException { + final List<SelectResultRow> list, final AtomicInteger nestedObjectCount) + throws GfJsonException { for (Object object : selectResults) { // Post processing object = cache.getSecurityService().postProcess(principal, null, null, object, false); @@ -307,7 +309,8 @@ public class DataCommandFunction implements InternalEntity, Function { } } - private GfJsonObject getJSONForStruct(final StructImpl impl, final AtomicInteger ai) throws GfJsonException { + private GfJsonObject getJSONForStruct(final StructImpl impl, final AtomicInteger ai) + throws GfJsonException { String fields[] = impl.getFieldNames(); Object[] values = impl.getFieldValues(); GfJsonObject jsonObject = new GfJsonObject(); @@ -330,7 +333,7 @@ public class DataCommandFunction implements InternalEntity, Function { } public DataCommandResult remove(final String key, final String keyClass, final String regionName, - final String removeAllKeys) { + final String removeAllKeys) { if (StringUtils.isEmpty(regionName)) { return DataCommandResult.createRemoveResult(key, null, null, CliStrings.REMOVE__MSG__REGIONNAME_EMPTY, false); @@ -394,8 +397,9 @@ public class DataCommandFunction implements InternalEntity, Function { } } - public DataCommandResult get(final Object principal, final String key, final String keyClass, final String valueClass, - final String regionName, final Boolean loadOnCacheMiss, final SecurityService securityService) { + public DataCommandResult get(final Object principal, final String key, final String keyClass, + final String valueClass, final String regionName, final Boolean loadOnCacheMiss, + final SecurityService securityService) { if (StringUtils.isEmpty(regionName)) { return DataCommandResult.createGetResult(key, null, null, @@ -468,7 +472,7 @@ public class DataCommandFunction implements InternalEntity, Function { } DataCommandResult locateEntry(final String key, final String keyClass, final String valueClass, - final String regionPath, final boolean recursive) { + final String regionPath, final boolean recursive) { if (StringUtils.isEmpty(regionPath)) { return DataCommandResult.createLocateEntryResult(key, null, null, @@ -583,8 +587,8 @@ public class DataCommandFunction implements InternalEntity, Function { } } - public DataCommandResult put(final String key, final String value, final boolean putIfAbsent, final String keyClass, - final String valueClass, final String regionName) { + public DataCommandResult put(final String key, final String value, final boolean putIfAbsent, + final String keyClass, final String valueClass, final String regionName) { if (StringUtils.isEmpty(regionName)) { return DataCommandResult.createPutResult(key, null, null, @@ -800,7 +804,8 @@ public class DataCommandFunction implements InternalEntity, Function { return list; } - private static String getLogMessage(final QueryObserver observer, final long startTime, final String query) { + private static String getLogMessage(final QueryObserver observer, final long startTime, + final String query) { String usedIndexesString = null; float time = 0.0f; http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java index ce42594..e283ace 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java @@ -31,20 +31,18 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.logging.LogService; public class DeployFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; - 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[] jarFilenames = (String[]) args[0]; - final byte[][] jarBytes = (byte[][]) args[1]; + Object[] args = (Object[]) context.getArguments(); + String[] jarFilenames = (String[]) args[0]; + byte[][] jarBytes = (byte[][]) args[1]; InternalCache cache = (InternalCache) context.getCache(); DistributedMember member = cache.getDistributedSystem().getDistributedMember(); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java index cf870ca..ce30140 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java @@ -52,16 +52,8 @@ import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException; * @since GemFire 7.0 */ public class DescribeDiskStoreFunction implements InternalEntity, Function { - private static final Logger logger = LogService.getLogger(); - protected static void assertState(final boolean condition, final String message, - final Object... args) { - if (!condition) { - throw new IllegalStateException(String.format(message, args)); - } - } - public void execute(final FunctionContext context) { InternalCache cache = (InternalCache) context.getCache(); @@ -86,8 +78,7 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { diskStoreDetails.setTimeInterval(diskStore.getTimeInterval()); diskStoreDetails.setWriteBufferSize(diskStore.getWriteBufferSize()); diskStoreDetails.setDiskUsageWarningPercentage(diskStore.getDiskUsageWarningPercentage()); - diskStoreDetails - .setDiskUsageCriticalPercentage(diskStore.getDiskUsageCriticalPercentage()); + diskStoreDetails.setDiskUsageCriticalPercentage(diskStore.getDiskUsageCriticalPercentage()); setDiskDirDetails(diskStore, diskStoreDetails); setRegionDetails(cache, diskStore, diskStoreDetails); @@ -97,18 +88,28 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { setAsyncEventQueueDetails(cache, diskStore, diskStoreDetails); context.getResultSender().lastResult(diskStoreDetails); + } else { context.getResultSender() .sendException(new DiskStoreNotFoundException( String.format("A disk store with name (%1$s) was not found on member (%2$s).", diskStoreName, memberName))); } + } catch (Exception e) { logger.error("Error occurred while executing 'describe disk-store': {}!", e.getMessage(), e); context.getResultSender().sendException(e); } } + // TODO: delete assertState + protected static void assertState(final boolean condition, final String message, + final Object... args) { + if (!condition) { + throw new IllegalStateException(String.format(message, args)); + } + } + private void setDiskDirDetails(final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { File[] diskDirs = diskStore.getDiskDirs(); @@ -139,12 +140,12 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { return region.getAttributes().getDataPolicy().withPersistence(); } - protected boolean isUsingDiskStore(final Region region, final DiskStore diskStore) { + boolean isUsingDiskStore(final Region region, final DiskStore diskStore) { return ((isPersistent(region) || isOverflowToDisk(region)) && ObjectUtils.equals(getDiskStoreName(region), diskStore.getName())); } - protected void setRegionDetails(final InternalCache cache, final DiskStore diskStore, + void setRegionDetails(final InternalCache cache, final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { for (Region<?, ?> region : cache.rootRegions()) { setRegionDetails(region, diskStore, diskStoreDetails); @@ -173,11 +174,11 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { DiskStoreDetails.DEFAULT_DISK_STORE_NAME)); } - protected boolean isUsingDiskStore(final CacheServer cacheServer, final DiskStore diskStore) { + boolean isUsingDiskStore(final CacheServer cacheServer, final DiskStore diskStore) { return ObjectUtils.equals(getDiskStoreName(cacheServer), diskStore.getName()); } - protected void setCacheServerDetails(final InternalCache cache, final DiskStore diskStore, + void setCacheServerDetails(final InternalCache cache, final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { for (CacheServer cacheServer : cache.getCacheServers()) { if (isUsingDiskStore(cacheServer, diskStore)) { @@ -199,11 +200,11 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { return gateway.isPersistenceEnabled(); } - protected boolean isUsingDiskStore(final GatewaySender gateway, final DiskStore diskStore) { + boolean isUsingDiskStore(final GatewaySender gateway, final DiskStore diskStore) { return ObjectUtils.equals(getDiskStoreName(gateway), diskStore.getName()); } - protected void setGatewayDetails(final InternalCache cache, final DiskStore diskStore, + private void setGatewayDetails(final InternalCache cache, final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { for (GatewaySender gatewaySender : cache.getGatewaySenders()) { if (isUsingDiskStore(gatewaySender, diskStore)) { @@ -215,7 +216,7 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { } } - protected void setPdxSerializationDetails(final InternalCache cache, final DiskStore diskStore, + void setPdxSerializationDetails(final InternalCache cache, final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { if (cache.getPdxPersistent()) { String diskStoreName = StringUtils.defaultIfBlank(cache.getPdxDiskStore(), @@ -230,12 +231,12 @@ public class DescribeDiskStoreFunction implements InternalEntity, Function { DiskStoreDetails.DEFAULT_DISK_STORE_NAME); } - protected boolean isUsingDiskStore(final AsyncEventQueue queue, final DiskStore diskStore) { + boolean isUsingDiskStore(final AsyncEventQueue queue, final DiskStore diskStore) { return (queue.isPersistent() && ObjectUtils.equals(getDiskStoreName(queue), diskStore.getName())); } - protected void setAsyncEventQueueDetails(final InternalCache cache, final DiskStore diskStore, + void setAsyncEventQueueDetails(final InternalCache cache, final DiskStore diskStore, final DiskStoreDetails diskStoreDetails) { for (AsyncEventQueue queue : cache.getAsyncEventQueues()) { if (isUsingDiskStore(queue, diskStore)) { http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java index 9dd3a7d..2cd5f74 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java @@ -34,19 +34,17 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; * @since GemFire 8.0 */ public class DestroyDiskStoreFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; - 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 diskStoreName = (String) args[0]; + Object[] args = (Object[]) context.getArguments(); + String diskStoreName = (String) args[0]; InternalCache cache = (InternalCache) context.getCache(); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java index be8bcd5..acb8991 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyIndexFunction.java @@ -30,11 +30,10 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.configuration.domain.XmlEntity; public class DestroyIndexFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { IndexInfo indexInfo = (IndexInfo) context.getArguments(); String memberId = null; @@ -84,8 +83,10 @@ public class DestroyIndexFunction implements InternalEntity, Function { } } } + } catch (CacheClosedException e) { context.getResultSender().lastResult(new CliFunctionResult(memberId, e, e.getMessage())); + } catch (Exception e) { context.getResultSender().lastResult(new CliFunctionResult(memberId, e, e.getMessage())); } @@ -94,7 +95,7 @@ public class DestroyIndexFunction implements InternalEntity, Function { /** * @return true if the index was found and removed/false if the index was not found. */ - private boolean removeIndexByName(String name, QueryService queryService) { + private boolean removeIndexByName(final String name, final QueryService queryService) { List<Index> indexes = (List<Index>) queryService.getIndexes(); boolean removed = false; http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportConfigFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportConfigFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportConfigFunction.java index 8da4141..1086ec1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportConfigFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportConfigFunction.java @@ -34,13 +34,11 @@ import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; import org.apache.geode.internal.logging.LogService; public class ExportConfigFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; - 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 = ""; @@ -64,26 +62,30 @@ public class ExportConfigFunction implements Function, InternalEntity { DistributionConfigImpl config = (DistributionConfigImpl) ((InternalDistributedSystem) cache.getDistributedSystem()) .getConfig(); - StringBuffer propStringBuf = new StringBuffer(); + StringBuilder propStringBuf = new StringBuilder(); String lineSeparator = System.getProperty("line.separator"); + for (Map.Entry entry : config.getConfigPropsFromSource(ConfigSource.runtime()).entrySet()) { if (entry.getValue() != null && !entry.getValue().equals("")) { propStringBuf.append(entry.getKey()).append("=").append(entry.getValue()) .append(lineSeparator); } } + for (Map.Entry entry : config.getConfigPropsFromSource(ConfigSource.api()).entrySet()) { if (entry.getValue() != null && !entry.getValue().equals("")) { propStringBuf.append(entry.getKey()).append("=").append(entry.getValue()) .append(lineSeparator); } } + for (Map.Entry entry : config.getConfigPropsDefinedUsingFiles().entrySet()) { if (entry.getValue() != null && !entry.getValue().equals("")) { propStringBuf.append(entry.getKey()).append("=").append(entry.getValue()) .append(lineSeparator); } } + // fix for bug 46653 for (Map.Entry entry : config.getConfigPropsFromSource(ConfigSource.launcher()).entrySet()) { if (entry.getValue() != null && !entry.getValue().equals("")) { http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java index 23a648e..e6ac89c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportDataFunction.java @@ -30,18 +30,18 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; * RegionSnapshotService to export the data */ public class ExportDataFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; - public void execute(FunctionContext context) { - final String[] args = (String[]) context.getArguments(); - final String regionName = args[0]; - final String fileName = args[1]; + public void execute(final FunctionContext context) { + String[] args = (String[]) context.getArguments(); + String regionName = args[0]; + String fileName = args[1]; try { Cache cache = context.getCache(); Region<?, ?> region = cache.getRegion(regionName); String hostName = cache.getDistributedSystem().getDistributedMember().getHost(); + if (region != null) { RegionSnapshotService<?, ?> snapshotService = region.getSnapshotService(); final File exportFile = new File(fileName); @@ -49,6 +49,7 @@ public class ExportDataFunction implements InternalEntity, Function { String successMessage = CliStrings.format(CliStrings.EXPORT_DATA__SUCCESS__MESSAGE, regionName, exportFile.getCanonicalPath(), hostName); context.getResultSender().lastResult(successMessage); + } else { throw new IllegalArgumentException( CliStrings.format(CliStrings.REGION_NOT_FOUND, regionName)); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java index d88c217..0c5e4fe 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java @@ -47,17 +47,14 @@ import org.apache.geode.management.internal.cli.util.TimeParser; import org.apache.geode.management.internal.configuration.domain.Configuration; /** - * Extracts the logs using a LogExporter which creates a zip file, and then writes the - * zip file bytes into a replicated region, this in effect, "stream" the zip file bytes to the - * locator + * Extracts the logs using a LogExporter which creates a zip file, and then writes the zip file + * bytes into a replicated region, this in effect, "stream" the zip file bytes to the locator * * <p> * The function only extracts .log and .gfs files under server's working directory */ public class ExportLogsFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; - private static final Logger logger = LogService.getLogger(); public static final String EXPORT_LOGS_REGION = "__exportLogsRegion"; @@ -114,15 +111,13 @@ public class ExportLogsFunction implements Function, InternalEntity { context.getResultSender().lastResult(null); } catch (Exception e) { - e.printStackTrace(); logger.error(e); context.getResultSender().sendException(e); } } - public static Region createOrGetExistingExportLogsRegion(boolean isInitiatingMember, - InternalCache cache) throws IOException, ClassNotFoundException { - + public static Region createOrGetExistingExportLogsRegion(final boolean isInitiatingMember, + final InternalCache cache) throws IOException, ClassNotFoundException { Region exportLogsRegion = cache.getRegion(EXPORT_LOGS_REGION); if (exportLogsRegion == null) { AttributesFactory<String, Configuration> regionAttrsFactory = new AttributesFactory<>(); @@ -141,7 +136,7 @@ public class ExportLogsFunction implements Function, InternalEntity { return exportLogsRegion; } - public static void destroyExportLogsRegion(InternalCache cache) { + public static void destroyExportLogsRegion(final InternalCache cache) { Region exportLogsRegion = cache.getRegion(EXPORT_LOGS_REGION); if (exportLogsRegion == null) { return; @@ -156,15 +151,15 @@ public class ExportLogsFunction implements Function, InternalEntity { public static class Args implements Serializable { - private LocalDateTime startTime; - private LocalDateTime endTime; - private Level logLevel; - private boolean thisLogLevelOnly; - private boolean includeLogs; - private boolean includeStats; + private final LocalDateTime startTime; + private final LocalDateTime endTime; + private final Level logLevel; + private final boolean thisLogLevelOnly; + private final boolean includeLogs; + private final boolean includeStats; - public Args(String startTime, String endTime, String logLevel, boolean logLevelOnly, - boolean logsOnly, boolean statsOnly) { + public Args(final String startTime, final String endTime, final String logLevel, + final boolean logLevelOnly, final boolean logsOnly, final boolean statsOnly) { this.startTime = TimeParser.parseTime(startTime); this.endTime = TimeParser.parseTime(endTime); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java index 8e44ce3..dd2a96d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction.java @@ -34,9 +34,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; * @since GemFire 7.0 */ public class FetchRegionAttributesFunction implements Function { - private static final long serialVersionUID = 4366812590788342070L; - private static final Logger logger = LogService.getLogger(); @Override @@ -45,15 +43,17 @@ public class FetchRegionAttributesFunction implements Function { } @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { try { String regionPath = (String) context.getArguments(); if (regionPath == null) { throw new IllegalArgumentException( CliStrings.CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH); } - FetchRegionAttributesFunctionResult<?, ?> result = getRegionAttributes(context.getCache(), regionPath); + FetchRegionAttributesFunctionResult<?, ?> result = + getRegionAttributes(context.getCache(), regionPath); context.getResultSender().lastResult(result); + } catch (IllegalArgumentException e) { if (logger.isDebugEnabled()) { logger.debug(e.getMessage(), e); @@ -63,7 +63,7 @@ public class FetchRegionAttributesFunction implements Function { } public static <K, V> FetchRegionAttributesFunctionResult<K, V> getRegionAttributes( - Cache cache, String regionPath) { + final Cache cache, final String regionPath) { Region<K, V> foundRegion = cache.getRegion(regionPath); if (foundRegion == null) { @@ -80,8 +80,8 @@ public class FetchRegionAttributesFunction implements Function { return result; } + // TODO: make FetchRegionAttributesFunctionResult immutable public static class FetchRegionAttributesFunctionResult<K, V> implements Serializable { - private static final long serialVersionUID = -3970828263897978845L; private RegionAttributes<K, V> regionAttributes; @@ -89,8 +89,7 @@ public class FetchRegionAttributesFunction implements Function { private String cacheLoaderClass; private String cacheWriterClass; - @SuppressWarnings("deprecation") - public FetchRegionAttributesFunctionResult(AttributesFactory<K, V> afactory) { + public FetchRegionAttributesFunctionResult(final AttributesFactory<K, V> afactory) { this.regionAttributes = afactory.create(); CacheListener<K, V>[] cacheListeners = this.regionAttributes.getCacheListeners(); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java index 06538ab..26df380 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java @@ -25,11 +25,10 @@ import org.apache.geode.internal.InternalEntity; import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus; public class FetchSharedConfigurationStatusFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { InternalLocator locator = InternalLocator.getLocator(); Cache cache = context.getCache(); DistributedMember member = cache.getDistributedSystem().getDistributedMember(); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java index 1d5f420..60a165c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction.java @@ -29,11 +29,10 @@ import org.apache.geode.management.internal.cli.util.BytesToString; * Class for Garbage collection function */ public class GarbageCollectionFunction implements Function, InternalEntity { - private static final long serialVersionUID = 1L; @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { BytesToString bytesToString = new BytesToString(); Map<String, String> resultMap = null; @@ -54,6 +53,7 @@ public class GarbageCollectionFunction implements Function, InternalEntity { resultMap.put("HeapSizeBeforeGC", bytesToString.of(totalMemoryBeforeGC - freeMemoryBeforeGC)); resultMap.put("HeapSizeAfterGC", bytesToString.of(totalMemoryAfterGC - freeMemoryAfterGC)); resultMap.put("TimeSpentInGC", String.valueOf(timeAfterGC - timeBeforeGC)); + } catch (Exception ex) { String message = "Exception in GC:" + ex.getMessage() + CliUtil.stackTraceAsString(ex); http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java index 2bf8de5..e8d4a26 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java @@ -38,13 +38,11 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; * The function to a create GatewayReceiver using given configuration parameters. */ public class GatewayReceiverCreateFunction implements InternalEntity, Function { - private static final long serialVersionUID = 8746830191680509335L; - private static final Logger logger = LogService.getLogger(); @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { ResultSender<Object> resultSender = context.getResultSender(); Cache cache = context.getCache(); @@ -58,16 +56,20 @@ public class GatewayReceiverCreateFunction implements InternalEntity, Function { GatewayReceiver createdGatewayReceiver = createGatewayReceiver(cache, gatewayReceiverCreateArgs); - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); + if (gatewayReceiverCreateArgs.getStartPort() != null) { attributes.put("start-port", gatewayReceiverCreateArgs.getStartPort().toString()); } + if (gatewayReceiverCreateArgs.getEndPort() != null) { attributes.put("end-port", gatewayReceiverCreateArgs.getEndPort().toString()); } + if (gatewayReceiverCreateArgs.getBindAddress() != null) { attributes.put("bind-address", gatewayReceiverCreateArgs.getBindAddress()); } + XmlEntity xmlEntity = XmlEntity.builder().withType(CacheXml.GATEWAY_RECEIVER) .withAttributes(attributes).build(); resultSender.lastResult(new CliFunctionResult(memberNameOrId, xmlEntity, @@ -77,6 +79,7 @@ public class GatewayReceiverCreateFunction implements InternalEntity, Function { } catch (IllegalStateException e) { resultSender.lastResult(handleException(memberNameOrId, e.getMessage(), e)); + } catch (Exception e) { String exceptionMsg = e.getMessage(); if (exceptionMsg == null) { @@ -101,8 +104,8 @@ public class GatewayReceiverCreateFunction implements InternalEntity, Function { /** * GatewayReceiver creation happens here. */ - private static GatewayReceiver createGatewayReceiver(Cache cache, - GatewayReceiverFunctionArgs gatewayReceiverCreateArgs) { + private static GatewayReceiver createGatewayReceiver(final Cache cache, + final GatewayReceiverFunctionArgs gatewayReceiverCreateArgs) { GatewayReceiverFactory gatewayReceiverFactory = cache.createGatewayReceiverFactory(); @@ -149,19 +152,22 @@ public class GatewayReceiverCreateFunction implements InternalEntity, Function { return gatewayReceiverFactory.create(); } - private static Class forName(String classToLoadName, String neededFor) { + private static Class forName(final String classToLoadName, final String neededFor) { Class loadedClass = null; + try { // Set Constraints ClassPathLoader classPathLoader = ClassPathLoader.getLatest(); if (classToLoadName != null && !classToLoadName.isEmpty()) { loadedClass = classPathLoader.forName(classToLoadName); } + } catch (ClassNotFoundException e) { throw new RuntimeException( CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, classToLoadName, neededFor), e); + } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, @@ -171,19 +177,23 @@ public class GatewayReceiverCreateFunction implements InternalEntity, Function { return loadedClass; } - private static Object newInstance(Class klass, String neededFor) { - Object instance = null; + private static Object newInstance(final Class klass, final String neededFor) { + Object instance; + try { instance = klass.newInstance(); + } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, klass, neededFor), e); + } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, klass, neededFor), e); } + return instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java index c190f45..615c683 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java @@ -20,7 +20,6 @@ import java.io.Serializable; * This class stores the arguments provided in the create gateway-receiver command. */ public class GatewayReceiverFunctionArgs implements Serializable { - private static final long serialVersionUID = -5158224572470173267L; private final Boolean manualStart; @@ -31,9 +30,9 @@ public class GatewayReceiverFunctionArgs implements Serializable { private final Integer maximumTimeBetweenPings; private final String[] gatewayTransportFilters; - public GatewayReceiverFunctionArgs(Boolean manualStart, Integer startPort, Integer endPort, - String bindAddress, Integer socketBufferSize, Integer maximumTimeBetweenPings, - String[] gatewayTransportFilters) { + public GatewayReceiverFunctionArgs(final Boolean manualStart, final Integer startPort, + final Integer endPort, final String bindAddress, final Integer socketBufferSize, + final Integer maximumTimeBetweenPings, final String[] gatewayTransportFilters) { this.manualStart = manualStart; this.startPort = startPort; this.endPort = endPort; http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java index d86d89e..8ef61a7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java @@ -35,13 +35,11 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.configuration.domain.XmlEntity; public class GatewaySenderCreateFunction implements InternalEntity, Function { - private static final long serialVersionUID = 8746830191680509335L; - private static final Logger logger = LogService.getLogger(); @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { ResultSender<Object> resultSender = context.getResultSender(); Cache cache = context.getCache(); @@ -58,8 +56,10 @@ public class GatewaySenderCreateFunction implements InternalEntity, Function { resultSender.lastResult(new CliFunctionResult(memberNameOrId, xmlEntity, CliStrings.format(CliStrings.CREATE_GATEWAYSENDER__MSG__GATEWAYSENDER_0_CREATED_ON_1, new Object[] {createdGatewaySender.getId(), memberNameOrId}))); + } catch (GatewaySenderException e) { resultSender.lastResult(handleException(memberNameOrId, e.getMessage(), e)); + } catch (Exception e) { String exceptionMsg = e.getMessage(); if (exceptionMsg == null) { @@ -84,8 +84,8 @@ public class GatewaySenderCreateFunction implements InternalEntity, Function { /** * Creates the GatewaySender with given configuration. */ - private static GatewaySender createGatewaySender(Cache cache, - GatewaySenderFunctionArgs gatewaySenderCreateArgs) { + private static GatewaySender createGatewaySender(final Cache cache, + final GatewaySenderFunctionArgs gatewaySenderCreateArgs) { GatewaySenderFactory gateway = cache.createGatewaySenderFactory(); Boolean isParallel = gatewaySenderCreateArgs.isParallel(); @@ -179,19 +179,22 @@ public class GatewaySenderCreateFunction implements InternalEntity, Function { gatewaySenderCreateArgs.getRemoteDistributedSystemId()); } - private static Class forName(String classToLoadName, String neededFor) { + private static Class forName(final String classToLoadName, final String neededFor) { Class loadedClass = null; + try { // Set Constraints ClassPathLoader classPathLoader = ClassPathLoader.getLatest(); if (classToLoadName != null && !classToLoadName.isEmpty()) { loadedClass = classPathLoader.forName(classToLoadName); } + } catch (ClassNotFoundException e) { throw new RuntimeException( CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, classToLoadName, neededFor), e); + } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, @@ -201,19 +204,23 @@ public class GatewaySenderCreateFunction implements InternalEntity, Function { return loadedClass; } - private static Object newInstance(Class klass, String neededFor) { - Object instance = null; + private static Object newInstance(final Class klass, final String neededFor) { + Object instance; + try { instance = klass.newInstance(); + } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, klass, neededFor), e); + } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, klass, neededFor), e); } + return instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java index ec93eef..1ff9506 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunction.java @@ -28,13 +28,11 @@ import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.i18n.CliStrings; public class GatewaySenderDestroyFunction implements InternalEntity, Function { - private static final long serialVersionUID = 1L; - private static final Logger logger = LogService.getLogger(); @Override - public void execute(FunctionContext context) { + public void execute(final FunctionContext context) { ResultSender<Object> resultSender = context.getResultSender(); Cache cache = context.getCache(); @@ -60,6 +58,7 @@ public class GatewaySenderDestroyFunction implements InternalEntity, Function { } catch (GatewaySenderException gse) { resultSender.lastResult(handleException(memberNameOrId, gse.getMessage(), gse)); + } catch (Exception e) { String exceptionMsg = e.getMessage(); if (exceptionMsg == null) { http://git-wip-us.apache.org/repos/asf/geode/blob/44cd213f/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 index 7cb00d6..a6603fd 100644 --- 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 @@ -1,18 +1,16 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. */ package org.apache.geode.management.internal.cli.util;
