You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/08/30 16:35:18 UTC
[1/3] geode git commit: GEODE-3472: Remove a great deal of
commented-out code.
Repository: geode
Updated Branches:
refs/heads/develop 76b4ef57b -> fb9a405f7
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 00902a9..6789416 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -14,25 +14,6 @@
*/
package org.apache.geode.management.internal.configuration.domain;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataSerializable;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.logging.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -43,11 +24,32 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.xpath.XPathExpressionException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataSerializable;
+import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
+
/****
* Domain class for defining a GemFire entity in XML.
*
@@ -60,7 +62,7 @@ public class XmlEntity implements VersionedDataSerializable {
private String type;
@SuppressWarnings("unused")
private String parentType;
- private Map<String, String> attributes = new HashMap<String, String>();
+ private Map<String, String> attributes = new HashMap<>();
private String xmlDefinition;
private String searchString;
@@ -112,13 +114,10 @@ public class XmlEntity implements VersionedDataSerializable {
*/
public XmlEntity(final String parentType, final String parentKey, final String parentValue,
final String childType, final String childKey, final String childValue) {
- // TODO this should be replaced with a builder.
- // TODO consider parent as nested XmlEntity type.
this.parentType = parentType;
this.type = childType;
initializeSearchString(parentKey, parentValue, this.prefix, childKey, childValue);
- // no init();
}
/****
@@ -268,13 +267,10 @@ public class XmlEntity implements VersionedDataSerializable {
if (attributes.size() > 0) {
queryStringBuilder.append("[");
Entry<String, String> attrEntry = attributeIter.next();
- // queryStringBuilder.append("@").append(attrEntry.getKey()).append("=\"").append(attrEntry.getValue()).append("\"");
queryStringBuilder.append("@").append(attrEntry.getKey()).append("='")
.append(attrEntry.getValue()).append("'");
while (attributeIter.hasNext()) {
attrEntry = attributeIter.next();
- // queryStringBuilder.append(" and
- // @").append(attrEntry.getKey()).append("=\"").append(attrEntry.getValue()).append("\"");
queryStringBuilder.append(" and @").append(attrEntry.getKey()).append("='")
.append(attrEntry.getValue()).append("'");
}
@@ -463,7 +459,7 @@ public class XmlEntity implements VersionedDataSerializable {
private XmlEntity xmlEntity;
/**
- * Private contstructor.
+ * Private constructor.
*
* @since GemFire 8.1
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
index ac5e99a..698c68a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
@@ -14,23 +14,24 @@
*/
package org.apache.geode.management.internal.configuration.messages;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+
/***
* Request sent by a member to the locator requesting the shared configuration
*
*/
public class ConfigurationRequest implements DataSerializableFixedID {
private static int DEFAULT_NUM_ATTEMPTS = 5;
- private Set<String> groups = new HashSet<String>();
+ private Set<String> groups = new HashSet<>();
private boolean isRequestForEntireConfiguration = false;
private int numAttempts = DEFAULT_NUM_ATTEMPTS;
@@ -74,7 +75,7 @@ public class ConfigurationRequest implements DataSerializableFixedID {
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
this.isRequestForEntireConfiguration = in.readBoolean();
int size = in.readInt();
- Set<String> groups = new HashSet<String>();
+ Set<String> groups = new HashSet<>();
if (size > 0) {
for (int i = 0; i < size; i++) {
groups.add(in.readUTF());
@@ -105,11 +106,8 @@ public class ConfigurationRequest implements DataSerializableFixedID {
return sb.toString();
}
- // TODO Sourabh, please review for correctness
- // Asif: Returning null, as otherwise backward compatibility tests fail
- // due to missing pre to & from data functions.
public Version[] getSerializationVersions() {
- return null;// new Version[] { Version.CURRENT };
+ return null;
}
public int getNumAttempts() {
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
index f86b9a3..63aa1ec 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
@@ -19,19 +19,6 @@ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION;
import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_PREFIX;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
-import org.apache.geode.management.internal.configuration.domain.CacheElement;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -45,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
+
import javax.xml.namespace.NamespaceContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -61,6 +49,20 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import org.apache.commons.lang.StringUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
+import org.apache.geode.management.internal.configuration.domain.CacheElement;
+import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+
public class XmlUtils {
/**
@@ -75,7 +77,7 @@ public class XmlUtils {
*/
public static Document createDocumentFromReader(final Reader reader)
throws SAXException, ParserConfigurationException, IOException {
- Document doc = null;
+ Document doc;
InputSource inputSource = new InputSource(reader);
doc = getDocumentBuilder().parse(inputSource);
@@ -148,7 +150,6 @@ public class XmlUtils {
final String namespace = childElement.getNamespaceURI();
if (namespace.equals(xmlEntity.getNamespace()) && type.equals(xmlEntity.getType())) {
- // TODO this should really be checking all attributes in xmlEntity.getAttributes
// First check if the element has a name
String nameOrId = getAttribute(childElement, "name");
// If not then check if the element has an Id
@@ -233,15 +234,15 @@ public class XmlUtils {
* Creates a node from the String xml definition
*
* @param owner
- * @param xmlDefintion
+ * @param xmlDefinition
* @return Node representing the xml definition
* @throws ParserConfigurationException
* @throws IOException
* @throws SAXException
*/
- private static Node createNode(Document owner, String xmlDefintion)
+ private static Node createNode(Document owner, String xmlDefinition)
throws SAXException, IOException, ParserConfigurationException {
- InputSource inputSource = new InputSource(new StringReader(xmlDefintion));
+ InputSource inputSource = new InputSource(new StringReader(xmlDefinition));
Document document = getDocumentBuilder().parse(inputSource);
Node newNode = document.getDocumentElement();
return owner.importNode(newNode, true);
@@ -279,7 +280,7 @@ public class XmlUtils {
* @since GemFire 8.1
*/
public static Map<String, List<String>> buildSchemaLocationMap(final String schemaLocation) {
- return buildSchemaLocationMap(new HashMap<String, List<String>>(), schemaLocation);
+ return buildSchemaLocationMap(new HashMap<>(), schemaLocation);
}
/**
@@ -296,12 +297,7 @@ public class XmlUtils {
*/
static Map<String, List<String>> buildSchemaLocationMap(
Map<String, List<String>> schemaLocationMap, final String schemaLocation) {
- if (null == schemaLocation) {
- return schemaLocationMap;
- }
-
if (null == schemaLocation || schemaLocation.isEmpty()) {
- // should really ever be null but being safe.
return schemaLocationMap;
}
@@ -323,7 +319,7 @@ public class XmlUtils {
}
/*****
- * Deletes all the node from the document which match the definition provided by xmlentity
+ * Deletes all the node from the document which match the definition provided by xmlEntity
*
* @param doc
* @param xmlEntity
@@ -366,8 +362,8 @@ public class XmlUtils {
*
*/
public static class XPathContext implements NamespaceContext {
- private HashMap<String, String> prefixToUri = new HashMap<String, String>();
- private HashMap<String, String> uriToPrefix = new HashMap<String, String>();
+ private HashMap<String, String> prefixToUri = new HashMap<>();
+ private HashMap<String, String> uriToPrefix = new HashMap<>();
public XPathContext() {}
@@ -408,7 +404,7 @@ public class XmlUtils {
* @throws TransformerFactoryConfigurationError
*/
public static String prettyXml(Node doc)
- throws IOException, TransformerFactoryConfigurationError, TransformerException {
+ throws TransformerFactoryConfigurationError, TransformerException {
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
@@ -428,8 +424,7 @@ public class XmlUtils {
DOMSource source = new DOMSource(element);
transformer.transform(source, result);
- String xmlString = result.getWriter().toString();
- return xmlString;
+ return result.getWriter().toString();
}
/****
@@ -510,7 +505,6 @@ public class XmlUtils {
}
if (null != document.getDoctype()) {
- // doc.setDocType(null);
Node root = document.getDocumentElement();
Document copiedDocument = getDocumentBuilder().newDocument();
@@ -551,7 +545,7 @@ public class XmlUtils {
buildSchemaLocationMap(schemaLocationAttribute);
List<String> schemaLocations = schemaLocationMap.get(namespaceUri);
if (null == schemaLocations) {
- schemaLocations = new ArrayList<String>();
+ schemaLocations = new ArrayList<>();
schemaLocationMap.put(namespaceUri, schemaLocations);
}
schemaLocations.clear();
@@ -665,7 +659,7 @@ public class XmlUtils {
* @param xmlEntity xml entity for the root , it also contains the attributes
* @throws IOException
*/
- public static void modifyRootAttributes(Document doc, XmlEntity xmlEntity) throws IOException {
+ public static void modifyRootAttributes(Document doc, XmlEntity xmlEntity) {
if (xmlEntity == null || xmlEntity.getAttributes() == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
index ce7ebfc..8a16aa4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
@@ -16,6 +16,7 @@ package org.apache.geode.management.internal.web.controllers;
import java.util.concurrent.Callable;
+import org.apache.commons.lang.StringUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@@ -25,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.WebRequest;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -194,7 +194,6 @@ public class DataCommandsController extends AbstractCommandsController {
@RequestParam(CliStrings.QUERY__QUERY) final String oql,
@RequestParam(value = CliStrings.QUERY__INTERACTIVE,
defaultValue = "true") final Boolean interactive) {
- // logRequest(request);
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.QUERY);
@@ -219,12 +218,12 @@ public class DataCommandsController extends AbstractCommandsController {
if (hasValue(includedRegions)) {
command.addOption(CliStrings.REBALANCE__INCLUDEREGION,
- StringUtils.join(includedRegions, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(includedRegions, ","));
}
if (hasValue(excludedRegions)) {
command.addOption(CliStrings.REBALANCE__EXCLUDEREGION,
- StringUtils.join(excludedRegions, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(excludedRegions, ","));
}
command.addOption(CliStrings.REBALANCE__SIMULATE, String.valueOf(simulate));
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
index 815bc47..9180414 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.management.internal.web.controllers;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.WebRequest;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -108,14 +108,13 @@ public class RegionCommandsController extends AbstractCommandsController {
required = false) final Boolean enableCloning,
@RequestParam(value = CliStrings.ALTER_REGION__EVICTIONMAX,
required = false) final Integer evictionMax) {
- // logRequest(request);
final CommandStringBuilder command = new CommandStringBuilder(CliStrings.ALTER_REGION);
command.addOption(CliStrings.ALTER_REGION__REGION, decode(regionNamePath));
if (hasValue(groups)) {
- command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, ","));
}
addCommandOption(request, command, CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
@@ -240,7 +239,7 @@ public class RegionCommandsController extends AbstractCommandsController {
}
if (hasValue(groups)) {
- command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+ command.addOption(CliStrings.GROUP, StringUtils.join(groups, ","));
}
command.addOption(CliStrings.CREATE_REGION__SKIPIFEXISTS,
@@ -320,7 +319,7 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(cacheListeners)) {
command.addOption(CliStrings.CREATE_REGION__CACHELISTENER,
- StringUtils.join(cacheListeners, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(cacheListeners, ","));
}
if (hasValue(cacheLoader)) {
@@ -333,12 +332,12 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(asyncEventQueueIds)) {
command.addOption(CliStrings.CREATE_REGION__ASYNCEVENTQUEUEID,
- StringUtils.join(asyncEventQueueIds, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(asyncEventQueueIds, ","));
}
if (hasValue(gatewaySenderIds)) {
command.addOption(CliStrings.CREATE_REGION__GATEWAYSENDERID,
- StringUtils.join(gatewaySenderIds, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewaySenderIds, ","));
}
if (Boolean.TRUE.equals(enableConcurrencyChecks)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
index e983f2a..63413b0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
@@ -14,15 +14,15 @@
*/
package org.apache.geode.management.internal.web.controllers;
+import java.io.IOException;
+import java.util.Set;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.apache.commons.lang.ArrayUtils;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.web.domain.Link;
-import org.apache.geode.management.internal.web.domain.LinkIndex;
-import org.apache.geode.management.internal.web.domain.QueryParameterSource;
-import org.apache.geode.management.internal.web.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -33,12 +33,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import java.io.IOException;
-import java.util.Set;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.web.domain.Link;
+import org.apache.geode.management.internal.web.domain.LinkIndex;
+import org.apache.geode.management.internal.web.domain.QueryParameterSource;
+import org.apache.geode.management.internal.web.http.HttpMethod;
/**
* The ShellCommandsController class implements GemFire REST API calls for Gfsh Shell Commands.
@@ -69,7 +71,6 @@ public class ShellCommandsController extends AbstractCommandsController {
return processCommand(decode(command));
}
- // TODO research the use of Jolokia instead
@RequestMapping(method = RequestMethod.GET, value = "/mbean/attribute")
public ResponseEntity<?> getAttribute(@RequestParam("resourceName") final String resourceName,
@RequestParam("attributeName") final String attributeName) {
@@ -77,19 +78,16 @@ public class ShellCommandsController extends AbstractCommandsController {
final Object attributeValue = getMBeanServer()
.getAttribute(ObjectName.getInstance(decode(resourceName)), decode(attributeName));
- return new ResponseEntity<byte[]>(IOUtils.serializeObject(attributeValue), HttpStatus.OK);
- } catch (AttributeNotFoundException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.BAD_REQUEST);
+ return new ResponseEntity<>(IOUtils.serializeObject(attributeValue), HttpStatus.OK);
+ } catch (AttributeNotFoundException | MalformedObjectNameException e) {
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.BAD_REQUEST);
} catch (InstanceNotFoundException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.NOT_FOUND);
- } catch (MalformedObjectNameException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.BAD_REQUEST);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.NOT_FOUND);
} catch (Exception e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
}
}
- // TODO research the use of Jolokia instead
@RequestMapping(method = RequestMethod.POST, value = "/mbean/operation")
public ResponseEntity<?> invoke(@RequestParam("resourceName") final String resourceName,
@RequestParam("operationName") final String operationName,
@@ -102,13 +100,13 @@ public class ShellCommandsController extends AbstractCommandsController {
final Object result = getMBeanServer().invoke(ObjectName.getInstance(decode(resourceName)),
decode(operationName), parameters, signature);
- return new ResponseEntity<byte[]>(IOUtils.serializeObject(result), HttpStatus.OK);
+ return new ResponseEntity<>(IOUtils.serializeObject(result), HttpStatus.OK);
} catch (InstanceNotFoundException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.NOT_FOUND);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.NOT_FOUND);
} catch (MalformedObjectNameException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.BAD_REQUEST);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.BAD_REQUEST);
} catch (Exception e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@@ -118,9 +116,9 @@ public class ShellCommandsController extends AbstractCommandsController {
final Set<ObjectName> objectNames =
getMBeanServer().queryNames(query.getObjectName(), query.getQueryExpression());
- return new ResponseEntity<byte[]>(IOUtils.serializeObject(objectNames), HttpStatus.OK);
+ return new ResponseEntity<>(IOUtils.serializeObject(objectNames), HttpStatus.OK);
} catch (IOException e) {
- return new ResponseEntity<String>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
+ return new ResponseEntity<>(printStackTrace(e), HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@@ -135,16 +133,11 @@ public class ShellCommandsController extends AbstractCommandsController {
* @see org.apache.geode.management.internal.web.domain.LinkIndex
* @see org.apache.geode.management.internal.web.http.HttpMethod
*/
- // TODO figure out a better way to maintain this link index, such as using an automated way to
- // introspect
- // the Spring Web MVC Controller RequestMapping Annotations.
@RequestMapping(method = RequestMethod.GET, value = "/index",
produces = MediaType.APPLICATION_XML_VALUE)
@ResponseBody
public LinkIndex index(@RequestParam(value = "scheme", required = false,
defaultValue = "http") final String scheme) {
- // logger.warning(String.format("Returning Link Index for Context Path (%1$s).",
- // ServletUriComponentsBuilder.fromCurrentContextPath().build().toString()));
return new LinkIndex()
// Cluster Commands
.add(new Link(CliStrings.STATUS_SHARED_CONFIG, toUri("/services/cluster-config", scheme)))
@@ -293,7 +286,7 @@ public class ShellCommandsController extends AbstractCommandsController {
@RequestMapping(method = {RequestMethod.GET, RequestMethod.HEAD}, value = "/ping")
public ResponseEntity<String> ping() {
- return new ResponseEntity<String>("<html><body><h1>Mischief Managed!</h1></body></html>",
+ return new ResponseEntity<>("<html><body><h1>Mischief Managed!</h1></body></html>",
HttpStatus.OK);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index a0788a0..3bda1c0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.Host;
@@ -227,7 +226,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
SerializableRunnable checkRegionMBeans = new SerializableRunnable() {
@Override
public void run() {
- final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+ final WaitCriterion waitForManagerMBean = new WaitCriterion() {
@Override
public boolean done() {
final ManagementService service = ManagementService.getManagementService(getCache());
@@ -247,7 +246,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
return "Probing for testExecuteFunctionOnRegionBug51480";
}
};
- waitForCriterion(waitForMaangerMBean, 2 * 60 * 1000, 2000, true);
+ waitForCriterion(waitForManagerMBean, 2 * 60 * 1000, 2000, true);
DistributedRegionMXBean bean = ManagementService.getManagementService(getCache())
.getDistributedRegionMXBean(Region.SEPARATOR + REGION_ONE);
assertNotNull(bean);
@@ -294,7 +293,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(this::getMemberId);
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
public void run() {
@@ -494,7 +493,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
final VM vm1 = Host.getHost(0).getVM(1);
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(this::getMemberId);
String command = "destroy function --id=" + function.getId() + " --member=" + vm1MemberId;
getLogWriter().info("testDestroyOnMember command=" + command);
CommandResult cmdResult = executeCommand(command);
@@ -560,13 +559,9 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
CommandResult cmdResult = executeCommand(command);
getLogWriter().info("testDestroyOnGroups cmdResult=" + cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
- String content = null;
- try {
- content = cmdResult.getContent().get("message").toString();
- getLogWriter().info("testDestroyOnGroups content = " + content);
- } catch (GfJsonException e) {
- fail("testDestroyOnGroups exception=" + e);
- }
+ String content;
+ content = cmdResult.getContent().get("message").toString();
+ getLogWriter().info("testDestroyOnGroups content = " + content);
assertNotNull(content);
assertTrue(content
.equals("[\"Destroyed " + TestFunction.TEST_FUNCTION1 + " Successfully on " + vm1id + ","
[3/3] geode git commit: GEODE-3472: Remove a great deal of
commented-out code.
Posted by ji...@apache.org.
GEODE-3472: Remove a great deal of commented-out code.
* this closes #748
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fb9a405f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fb9a405f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fb9a405f
Branch: refs/heads/develop
Commit: fb9a405f78a1efd3fb3033ff36e9065e8b545ec3
Parents: 76b4ef5
Author: Patrick Rhomberg <pr...@pivotal.io>
Authored: Fri Aug 18 13:59:44 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Aug 30 09:34:06 2017 -0700
----------------------------------------------------------------------
.../geode/management/GemFireProperties.java | 43 +---
.../cli/CommandProcessingException.java | 1 -
.../geode/management/cli/CommandService.java | 47 +----
.../management/internal/MBeanJMXAdapter.java | 199 +++++++------------
.../management/internal/ManagementAgent.java | 70 ++++---
.../internal/SystemManagementService.java | 5 +-
.../internal/beans/MBeanAggregator.java | 7 +-
.../internal/beans/ManagementAdapter.java | 46 ++---
.../internal/beans/stats/VMStatsMonitor.java | 14 +-
.../geode/management/internal/cli/CliUtil.java | 107 +++-------
.../internal/cli/CommandResponseBuilder.java | 27 +--
.../geode/management/internal/cli/Launcher.java | 11 +-
.../management/internal/cli/LogWrapper.java | 44 +---
.../internal/cli/commands/ConnectCommand.java | 68 +++----
.../internal/cli/commands/ShellCommands.java | 35 ++--
.../cli/commands/ShowMetricsCommand.java | 3 -
.../internal/cli/commands/StartMemberUtils.java | 24 +--
.../cli/converters/MemberGroupConverter.java | 11 +-
.../internal/cli/domain/DataCommandResult.java | 14 +-
.../cli/functions/DataCommandFunction.java | 10 -
.../internal/cli/i18n/CliStrings.java | 54 +----
.../cli/remote/CommandExecutionContext.java | 15 +-
.../internal/cli/result/AbstractResultData.java | 49 ++---
.../internal/cli/result/CommandResult.java | 96 +++------
.../cli/result/CompositeResultData.java | 19 +-
.../internal/cli/result/ResultBuilder.java | 17 +-
.../internal/cli/result/ResultData.java | 6 +-
.../internal/cli/result/TableBuilder.java | 9 +-
.../management/internal/cli/shell/Gfsh.java | 84 +++-----
.../cli/shell/GfshExecutionStrategy.java | 11 -
.../internal/cli/shell/JmxOperationInvoker.java | 27 +--
.../cli/shell/unsafe/GfshSignalHandler.java | 13 +-
.../internal/cli/util/ReadWriteFile.java | 78 +++-----
.../configuration/domain/CacheElement.java | 20 +-
.../configuration/domain/XmlEntity.java | 50 +++--
.../messages/ConfigurationRequest.java | 18 +-
.../internal/configuration/utils/XmlUtils.java | 60 +++---
.../web/controllers/DataCommandsController.java | 7 +-
.../controllers/RegionCommandsController.java | 13 +-
.../controllers/ShellCommandsController.java | 63 +++---
.../cli/commands/FunctionCommandsDUnitTest.java | 19 +-
41 files changed, 491 insertions(+), 1023 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
index 6257967..c892abd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java
@@ -94,7 +94,7 @@ public class GemFireProperties {
* same package.
*
* The peer and server parameters are optional. They specify whether the locator can be used for
- * peers to discover eachother, or for clients to discover peers. By default both are true.
+ * peers to discover each other, or for clients to discover peers. By default both are true.
* Default: "" (doesn't start a locator)
**/
private String startLocator;
@@ -163,26 +163,6 @@ public class GemFireProperties {
* file deletion.
**/
private int logDiskSpaceLimit;
- // /**
- // * If true, all gemfire socket communication is configured to use SSL through
- // * JSSE.
- // **/
- // private boolean sslEnabled;
- // /**
- // * A space seperated list of the SSL cipher suites to enable. Those listed
- // * must be supported by the available providers.
- // **/
- // private String sslCiphers;
- // /**
- // * A space seperated list of the SSL protocols to enable. Those listed must be
- // * supported by the available providers.
- // **/
- // private String sslProtocols;
- // /**
- // * If false, allow ciphers that do not require the client side of the
- // * connection to be authenticated.
- // **/
- // private boolean sslRequireAuthentication;
/**
* The number of milliseconds a thread can keep exclusive access to a socket that it is not
* actively using. Once a thread loses its lease to a socket it will need to re-acquire a socket
@@ -993,26 +973,6 @@ public class GemFireProperties {
}
- // public void setSSLEnabled(boolean sslEnabled) {
- // this.sslEnabled = sslEnabled;
- //
- // }
- //
- // public void setSSLCiphers(String sslCiphers) {
- // this.sslCiphers = sslCiphers;
- //
- // }
- //
- // public void setSSLProtocols(String sslProtocols) {
- // this.sslProtocols = sslProtocols;
- //
- // }
- //
- // public void setSSLRequireAuthentication(boolean sslRequireAuthentication) {
- // this.sslRequireAuthentication = sslRequireAuthentication;
- //
- // }
-
public void setSocketLeaseTime(int socketLeaseTime) {
this.socketLeaseTime = socketLeaseTime;
@@ -1288,7 +1248,6 @@ public class GemFireProperties {
}
public void setJmxManagerHttpPort(int jmxManagerHttpPort) {
- // this.jmxManagerHttpPort = jmxManagerHttpPort;
setHttpServicePort(jmxManagerHttpPort);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
index 5f8c10f..1511da0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java
@@ -53,7 +53,6 @@ public class CommandProcessingException extends RuntimeException {
* Error Type indicating the absence of value for named parameter of a command.
*/
public static int OPTION_VALUE_REQUIRED = 9;
- // public static int ARGUMENT_VALUE_REQUIRED = 10;
/**
* Error Type indicating IO errors occurred while accessing File/Network resource
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
index 55957b2..20f1c75 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
@@ -113,16 +113,12 @@ public abstract class CommandService {
"Can not create command service as cache doesn't exist or cache is closed.");
}
- /*
- * if (!cache.isServer()) { throw new IllegalArgumentException("Server cache is required."); }
- */
-
if (localCommandService == null || !localCommandService.isUsable()) {
String nonExistingDependency = CliUtil.cliDependenciesExist(false);
if (nonExistingDependency != null) {
throw new DependenciesNotFoundException(
LocalizedStrings.CommandServiceManager_COULD_NOT_FIND__0__LIB_NEEDED_FOR_CLI_GFSH
- .toLocalizedString(new Object[] {nonExistingDependency}));
+ .toLocalizedString(nonExistingDependency));
}
localCommandService = new MemberCommandService((InternalCache) cache);
@@ -144,45 +140,4 @@ public abstract class CommandService {
return null;
}
-
- // public static CommandService createCommandService(RegionService regionService) {
- // if (regionService == null || regionService.isClosed()) {
- // throw new CacheClosedException("Can not create command service as region service doesn't exist
- // or cache is closed.");
- // }
- //
- // CommandService commandService;
- //
- // if (Cache.class.isInstance(regionService) &&
- // ((Cache) regionService).isServer() &&
- // CacheFactory.getAnyInstance() == regionService) {
- // commandService = createLocalCommandService((Cache) regionService);
- // } else {
- // Pool poolToUse = null;
- // if (ProxyCache.class.isInstance(regionService)) {
- // ProxyCache proxyCache = (ProxyCache) regionService;
- // poolToUse = proxyCache.getUserAttributes().getPool();
- // } else if (ClientCache.class.isInstance(regionService)) {
- // ClientCache localCache = (ClientCache) regionService;
- // poolToUse = localCache.getDefaultPool();
- // } else {
- // throw new IllegalArgumentException("Can not create Command Service for given Region Service: "
- // + regionService);
- // }
- // commandService = new ProxyCommandService(poolToUse);
- // }
- //
- // return commandService;
- // }
- //
- // public static CommandService createRemoteCommandService(String poolName) {
- // Pool poolToUse = PoolManager.find(poolName);
- //
- // if (poolToUse == null) {
- // throw new IllegalArgumentException("Can not create Command Service as a Pool with name \"" +
- // poolName+"\" was not found.");
- // }
- //
- // return new ProxyCommandService(poolToUse);
- // }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
index d375ac8..8d6b2e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java
@@ -72,16 +72,11 @@ public class MBeanJMXAdapter implements ManagementConstants {
private DistributedMember distMember;
/**
- * log writer, or null if there is no distributed system available
- */
- // private LogWriterI18n logger = InternalDistributedSystem.getLoggerI18n();
-
- /**
* public constructor
*/
public MBeanJMXAdapter() {
- this.localGemFireMBean = new ConcurrentHashMap<ObjectName, Object>();
+ this.localGemFireMBean = new ConcurrentHashMap<>();
this.distMember = InternalDistributedSystem.getConnectedInstance().getDistributedMember();
}
@@ -95,7 +90,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
*
* @param object
* @param objectName
- * @return modifed ObjectName
+ * @return modified ObjectName
*/
public ObjectName registerMBean(Object object, ObjectName objectName, boolean isGemFireMBean) {
ObjectName newObjectName = objectName;
@@ -110,15 +105,8 @@ public class MBeanJMXAdapter implements ManagementConstants {
mbeanServer.registerMBean(object, newObjectName);
this.localGemFireMBean.put(newObjectName, object);
- } catch (InstanceAlreadyExistsException e) {
- throw new ManagementException(e);
- } catch (MBeanRegistrationException e) {
- throw new ManagementException(e);
- } catch (NotCompliantMBeanException e) {
- throw new ManagementException(e);
- } catch (MalformedObjectNameException e) {
- throw new ManagementException(e);
- } catch (NullPointerException e) {
+ } catch (InstanceAlreadyExistsException | NullPointerException | MalformedObjectNameException
+ | NotCompliantMBeanException | MBeanRegistrationException e) {
throw new ManagementException(e);
}
return newObjectName;
@@ -139,19 +127,17 @@ public class MBeanJMXAdapter implements ManagementConstants {
String className = instance.getClassName();
Class cls = ClassLoadUtil.classFromName(className);
Type[] intfTyps = cls.getGenericInterfaces();
- for (int i = 0; i < intfTyps.length; i++) {
- Class intfTyp = (Class) intfTyps[i];
+ for (Type intfTyp1 : intfTyps) {
+ Class intfTyp = (Class) intfTyp1;
if (intfTyp.equals(NotificationEmitter.class)) {
return true;
}
}
- Class supreClassTyp = (Class) cls.getGenericSuperclass();
- if (supreClassTyp != null && supreClassTyp.equals(NotificationBroadcasterSupport.class)) {
+ Class superClassType = (Class) cls.getGenericSuperclass();
+ if (superClassType != null && superClassType.equals(NotificationBroadcasterSupport.class)) {
return true;
}
- } catch (InstanceNotFoundException e) {
- throw new ManagementException(e);
- } catch (ClassNotFoundException e) {
+ } catch (InstanceNotFoundException | ClassNotFoundException e) {
throw new ManagementException(e);
}
return false;
@@ -174,13 +160,8 @@ public class MBeanJMXAdapter implements ManagementConstants {
mbeanServer.registerMBean(object, objectName);
- } catch (InstanceAlreadyExistsException e) {
- throw new ManagementException(e);
- } catch (MBeanRegistrationException e) {
- throw new ManagementException(e);
- } catch (NotCompliantMBeanException e) {
- throw new ManagementException(e);
- } catch (NullPointerException e) {
+ } catch (InstanceAlreadyExistsException | NullPointerException | NotCompliantMBeanException
+ | MBeanRegistrationException e) {
throw new ManagementException(e);
}
@@ -205,11 +186,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
if (localGemFireMBean.get(objectName) != null) {
localGemFireMBean.remove(objectName);
}
- } catch (NullPointerException e) {
- throw new ManagementException(e);
- } catch (InstanceNotFoundException e) {
- throw new ManagementException(e);
- } catch (MBeanRegistrationException e) {
+ } catch (NullPointerException | MBeanRegistrationException | InstanceNotFoundException e) {
throw new ManagementException(e);
}
@@ -253,9 +230,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
for (ObjectName objectName : gemFireObjects) {
unregisterMBean(objectName);
}
- } catch (MalformedObjectNameException e) {
- throw new ManagementException(e);
- } catch (NullPointerException e) {
+ } catch (MalformedObjectNameException | NullPointerException e) {
throw new ManagementException(e);
}
@@ -324,34 +299,13 @@ public class MBeanJMXAdapter implements ManagementConstants {
}
private static boolean containsSpecialChar(String value) {
- if (value.contains(":")) {
- return true;
- }
- if (value.contains("@")) {
- return true;
- }
- if (value.contains("-")) {
- return true;
- }
- if (value.contains("#")) {
- return true;
- }
- if (value.contains("+")) {
- return true;
- }
- if (value.contains("?")) {
- return true;
- }
- return false;
+ return value.contains(":") || value.contains("@") || value.contains("-") || value.contains("#")
+ || value.contains("+") || value.contains("?");
}
private static boolean isQuoted(String value) {
final int len = value.length();
- if (len < 2 || value.charAt(0) != '"' || value.charAt(len - 1) != '"') {
- return false;
- } else {
- return true;
- }
+ return len >= 2 && value.charAt(0) == '"' && value.charAt(len - 1) == '"';
}
/**
@@ -428,7 +382,7 @@ public class MBeanJMXAdapter implements ManagementConstants {
}
public AsyncEventQueueMXBean getAsyncEventQueueMXBean(String queueId) {
- ObjectName objName = getAsycnEventQueueMBeanName(distMember, queueId);
+ ObjectName objName = getAsyncEventQueueMBeanName(distMember, queueId);
return (AsyncEventQueueMXBean) localGemFireMBean.get(objName);
}
@@ -441,104 +395,102 @@ public class MBeanJMXAdapter implements ManagementConstants {
public static ObjectName getObjectName(String name) {
try {
return ObjectName.getInstance(name);
- } catch (MalformedObjectNameException e) {
- throw new ManagementException(e);
- } catch (NullPointerException e) {
+ } catch (MalformedObjectNameException | NullPointerException e) {
throw new ManagementException(e);
}
}
public static ObjectName getMemberMBeanName(DistributedMember member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN,
- new Object[] {getMemberNameOrId(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, getMemberNameOrId(member))));
}
public static ObjectName getMemberMBeanName(String member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN,
- new Object[] {makeCompliantName(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, makeCompliantName(member))));
}
public static ObjectName getRegionMBeanName(DistributedMember member, String regionPath) {
return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN,
- new Object[] {makeCompliantRegionPath(regionPath), getMemberNameOrId(member)})));
+ makeCompliantRegionPath(regionPath), getMemberNameOrId(member))));
}
public static ObjectName getRegionMBeanName(String member, String regionPath) {
return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN,
- new Object[] {makeCompliantRegionPath(regionPath), makeCompliantName(member)})));
+ makeCompliantRegionPath(regionPath), makeCompliantName(member))));
}
public static ObjectName getRegionMBeanName(ObjectName memberMBeanName, String regionPath) {
- return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN,
- new Object[] {makeCompliantRegionPath(regionPath),
- memberMBeanName.getKeyProperty(ManagementConstants.OBJECTNAME_MEMBER_APPENDER)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__REGION_MXBEAN, makeCompliantRegionPath(regionPath),
+ memberMBeanName.getKeyProperty(ManagementConstants.OBJECTNAME_MEMBER_APPENDER))));
}
public static ObjectName getDiskStoreMBeanName(DistributedMember member, String diskName) {
- return getObjectName((MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN,
- new Object[] {diskName, getMemberNameOrId(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, diskName, getMemberNameOrId(member))));
}
public static ObjectName getDiskStoreMBeanName(String member, String diskName) {
- return getObjectName((MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN,
- new Object[] {diskName, makeCompliantName(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, diskName, makeCompliantName(member))));
}
public static ObjectName getClientServiceMBeanName(int serverPort, DistributedMember member) {
return getObjectName((MessageFormat.format(OBJECTNAME__CLIENTSERVICE_MXBEAN,
- new Object[] {String.valueOf(serverPort), getMemberNameOrId(member)})));
+ String.valueOf(serverPort), getMemberNameOrId(member))));
}
public static ObjectName getClientServiceMBeanName(int serverPort, String member) {
return getObjectName((MessageFormat.format(OBJECTNAME__CLIENTSERVICE_MXBEAN,
- new Object[] {String.valueOf(serverPort), makeCompliantName(member)})));
+ String.valueOf(serverPort), makeCompliantName(member))));
}
public static ObjectName getLockServiceMBeanName(DistributedMember member,
String lockServiceName) {
- return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN,
- new Object[] {lockServiceName, getMemberNameOrId(member)})));
+ return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, lockServiceName,
+ getMemberNameOrId(member))));
}
public static ObjectName getLockServiceMBeanName(String member, String lockServiceName) {
- return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN,
- new Object[] {lockServiceName, makeCompliantName(member)})));
+ return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, lockServiceName,
+ makeCompliantName(member))));
}
public static ObjectName getGatewayReceiverMBeanName(DistributedMember member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN,
- new Object[] {getMemberNameOrId(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, getMemberNameOrId(member))));
}
public static ObjectName getGatewayReceiverMBeanName(String member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN,
- new Object[] {makeCompliantName(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, makeCompliantName(member))));
}
public static ObjectName getGatewaySenderMBeanName(DistributedMember member, String id) {
- return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN,
- new Object[] {id, getMemberNameOrId(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, id, getMemberNameOrId(member))));
}
public static ObjectName getGatewaySenderMBeanName(String member, String id) {
- return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN,
- new Object[] {id, makeCompliantName(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, id, makeCompliantName(member))));
}
- public static ObjectName getAsycnEventQueueMBeanName(DistributedMember member, String queueId) {
- return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN,
- new Object[] {queueId, getMemberNameOrId(member)})));
+ public static ObjectName getAsyncEventQueueMBeanName(DistributedMember member, String queueId) {
+ return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, queueId,
+ getMemberNameOrId(member))));
}
- public static ObjectName getAsycnEventQueueMBeanName(String member, String queueId) {
- return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN,
- new Object[] {queueId, makeCompliantName(member)})));
+ public static ObjectName getAsyncEventQueueMBeanName(String member, String queueId) {
+ return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, queueId,
+ makeCompliantName(member))));
}
public static ObjectName getDistributedRegionMbeanName(String regionPath) {
return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN,
- new Object[] {makeCompliantRegionPath(regionPath)})));
+ makeCompliantRegionPath(regionPath))));
}
/**
@@ -548,13 +500,12 @@ public class MBeanJMXAdapter implements ManagementConstants {
* @return ObjectName MBean name
*/
public static ObjectName getDistributedRegionMbeanNameInternal(String regionPath) {
- return getObjectName(
- (MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN, new Object[] {regionPath})));
+ return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN, regionPath)));
}
public static ObjectName getDistributedLockServiceName(String lockService) {
- return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDLOCKSERVICE_MXBEAN,
- new Object[] {lockService})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__DISTRIBUTEDLOCKSERVICE_MXBEAN, lockService)));
}
public static ObjectName getDistributedSystemName() {
@@ -564,23 +515,23 @@ public class MBeanJMXAdapter implements ManagementConstants {
public static ObjectName getManagerName() {
String member =
getMemberNameOrId(InternalDistributedSystem.getConnectedInstance().getDistributedMember());
- return getObjectName((MessageFormat.format(OBJECTNAME__MANAGER_MXBEAN, new Object[] {member})));
+ return getObjectName((MessageFormat.format(OBJECTNAME__MANAGER_MXBEAN, member)));
}
public static ObjectName getLocatorMBeanName(DistributedMember member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN,
- new Object[] {getMemberNameOrId(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, getMemberNameOrId(member))));
}
public static ObjectName getLocatorMBeanName(String member) {
- return getObjectName((MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN,
- new Object[] {makeCompliantName(member)})));
+ return getObjectName(
+ (MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, makeCompliantName(member))));
}
public static ObjectName getCacheServiceMBeanName(DistributedMember member,
String cacheServiceId) {
- return getObjectName((MessageFormat.format(OBJECTNAME__CACHESERVICE_MXBEAN,
- new Object[] {cacheServiceId, getMemberNameOrId(member)})));
+ return getObjectName((MessageFormat.format(OBJECTNAME__CACHESERVICE_MXBEAN, cacheServiceId,
+ getMemberNameOrId(member))));
}
public Map<ObjectName, Object> getLocalGemFireMBean() {
@@ -592,12 +543,12 @@ public class MBeanJMXAdapter implements ManagementConstants {
InternalDistributedMember iMember = (InternalDistributedMember) member;
final StringBuilder sb = new StringBuilder();
sb.append(iMember.getInetAddress().getHostAddress());
- sb.append("<v" + iMember.getVmViewId() + ">"); // View ID will be 0 for
- // Loner, but in that case no
- // federation as well
+ // View ID will be 0 for Loner, but in that case no federation as well
+ sb.append("<v").append(iMember.getVmViewId()).append(">");
sb.append(iMember.getPort());
- return makeCompliantName(sb.toString().toLowerCase());// Lower case to
- // handle IPv6
+ // Lower case to handle IPv6
+ return makeCompliantName(sb.toString().toLowerCase());
+
}
public static boolean isAttributeAvailable(String attributeName, String objectName) {
@@ -605,24 +556,12 @@ public class MBeanJMXAdapter implements ManagementConstants {
try {
ObjectName objName = new ObjectName(objectName);
mbeanServer.getAttribute(objName, attributeName);
- } catch (MalformedObjectNameException e) {
- return false;
- } catch (NullPointerException e) {
- return false;
- } catch (AttributeNotFoundException e) {
- return false;
- } catch (InstanceNotFoundException e) {
- return false;
- } catch (MBeanException e) {
- return false;
- } catch (ReflectionException e) {
+ } catch (MalformedObjectNameException | ReflectionException | MBeanException
+ | InstanceNotFoundException | AttributeNotFoundException | NullPointerException e) {
return false;
}
return true;
}
-
- public static int VALUE_NOT_AVAILABLE = -1;
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
index 11590cf..39ad703 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
@@ -14,32 +14,6 @@
*/
package org.apache.geode.management.internal;
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.net.SSLConfigurationFactory;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
-import org.apache.geode.internal.tcp.TCPConduit;
-import org.apache.geode.management.ManagementException;
-import org.apache.geode.management.ManagementService;
-import org.apache.geode.management.ManagerMXBean;
-import org.apache.geode.management.internal.security.AccessControlMBean;
-import org.apache.geode.management.internal.security.MBeanServerWrapper;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-
import java.io.IOException;
import java.io.Serializable;
import java.lang.management.ManagementFactory;
@@ -55,6 +29,7 @@ import java.rmi.server.RMIServerSocketFactory;
import java.rmi.server.UnicastRemoteObject;
import java.util.HashMap;
import java.util.Set;
+
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
@@ -68,6 +43,33 @@ import javax.management.remote.rmi.RMIJRMPServerImpl;
import javax.management.remote.rmi.RMIServerImpl;
import javax.rmi.ssl.SslRMIClientSocketFactory;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
+import org.apache.geode.internal.tcp.TCPConduit;
+import org.apache.geode.management.ManagementException;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.management.ManagerMXBean;
+import org.apache.geode.management.internal.security.AccessControlMBean;
+import org.apache.geode.management.internal.security.MBeanServerWrapper;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController;
+
/**
* Agent implementation that controls the JMX server end points for JMX clients to connect, such as
* an RMI server.
@@ -390,7 +392,7 @@ public class ManagementAgent {
logger.debug("Starting jmx manager agent on port {}{}", port,
(bindAddr != null ? (" bound to " + bindAddr) : "") + (ssl ? " using SSL" : ""));
}
- RMIClientSocketFactory rmiClientSocketFactory = ssl ? new SslRMIClientSocketFactory() : null;// RMISocketFactory.getDefaultSocketFactory();
+ RMIClientSocketFactory rmiClientSocketFactory = ssl ? new SslRMIClientSocketFactory() : null;
RMIServerSocketFactory rmiServerSocketFactory =
new GemFireRMIServerSocketFactory(socketCreator, bindAddr);
@@ -410,7 +412,7 @@ public class ManagementAgent {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
// Environment map. why is this declared as HashMap?
- final HashMap<String, Object> env = new HashMap<String, Object>();
+ final HashMap<String, Object> env = new HashMap<>();
// Manually creates and binds a JMX RMI Connector Server stub with the
// registry created above: the port we pass here is the port that can
@@ -459,8 +461,7 @@ public class ManagementAgent {
try {
registry.bind("jmxrmi", stub);
} catch (AlreadyBoundException x) {
- final IOException io = new IOException(x.getMessage());
- io.initCause(x);
+ final IOException io = new IOException(x.getMessage(), x);
throw io;
}
super.start();
@@ -487,12 +488,9 @@ public class ManagementAgent {
String accessFile = this.config.getJmxManagerAccessFile();
if (accessFile != null && accessFile.length() > 0) {
- // Lets not use default connector based authorization
- // env.put("jmx.remote.x.access.file", accessFile);
// Rewire the mbs hierarchy to set accessController
ReadOpFileAccessController controller = new ReadOpFileAccessController(accessFile);
controller.setMBeanServer(mbs);
- mbs = controller;
}
}
@@ -529,7 +527,7 @@ public class ManagementAgent {
private static final long serialVersionUID = -7604285019188827617L;
- private/* final hack to prevent serialization */ transient SocketCreator sc;
+ private transient SocketCreator sc;
public GemFireRMIClientSocketFactory(SocketCreator sc) {
this.sc = sc;
@@ -537,7 +535,7 @@ public class ManagementAgent {
@Override
public Socket createSocket(String host, int port) throws IOException {
- return this.sc.connectForClient(host, port, 0/* no timeout */);
+ return this.sc.connectForClient(host, port, 0);
}
}
@@ -545,7 +543,7 @@ public class ManagementAgent {
implements RMIServerSocketFactory, Serializable {
private static final long serialVersionUID = -811909050641332716L;
- private/* final hack to prevent serialization */ transient SocketCreator sc;
+ private transient SocketCreator sc;
private final InetAddress bindAddr;
public GemFireRMIServerSocketFactory(SocketCreator sc, InetAddress bindAddr) {
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
index c770f89..9a92eaa 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
@@ -320,8 +320,7 @@ public class SystemManagementService extends BaseManagementService {
return jmxAdapter.getLocalRegionMXBean(regionPath);
}
- public <T> T getMBeanProxy(ObjectName objectName, Class<T> interfaceClass) { // TODO: this is too
- // generic
+ public <T> T getMBeanProxy(ObjectName objectName, Class<T> interfaceClass) {
if (!isStartedAndOpen()) {
return null;
}
@@ -556,7 +555,7 @@ public class SystemManagementService extends BaseManagementService {
@Override
public ObjectName getAsyncEventQueueMBeanName(DistributedMember member, String queueId) {
- return MBeanJMXAdapter.getAsycnEventQueueMBeanName(member, queueId);
+ return MBeanJMXAdapter.getAsyncEventQueueMBeanName(member, queueId);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
index d0a6e35..98d1810 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
@@ -42,7 +42,7 @@ import org.apache.geode.management.internal.SystemManagementService;
*/
public class MBeanAggregator implements ProxyListener {
- private static final List<Class> distributedMBeanList = new ArrayList<Class>();
+ private static final List<Class> distributedMBeanList = new ArrayList<>();
/**
@@ -405,10 +405,7 @@ public class MBeanAggregator implements ProxyListener {
}
public void quorumLost(Set<InternalDistributedMember> failures,
- List<InternalDistributedMember> remaining) {
- // [bruce] does this need to propagate through this bridge object?
- // distributedSystemBridge.quorumLost(failures, remaining);
- }
+ List<InternalDistributedMember> remaining) {}
@Override
public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
index 8ea84f5..e35e97b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
@@ -14,7 +14,24 @@
*/
package org.apache.geode.management.internal.beans;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.Notification;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
@@ -58,21 +75,6 @@ import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
import org.apache.geode.management.membership.ClientMembershipListenerAdapter;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import org.apache.logging.log4j.Logger;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
/**
* Acts as an intermediate between MBean layer and Federation Layer. Handles all Call backs from
@@ -151,8 +153,7 @@ public class ManagementAdapter {
// Type casting to MemberMXBean to expose only those methods described in
// the interface;
- ObjectName changedMBeanName =
- service.registerInternalMBean((MemberMXBean) memberBean, memberMBeanName);
+ ObjectName changedMBeanName = service.registerInternalMBean(memberBean, memberMBeanName);
service.federate(changedMBeanName, MemberMXBean.class, true);
this.serviceInitialised = true;
@@ -530,7 +531,7 @@ public class ManagementAdapter {
}
AsyncEventQueueMBeanBridge bridge = new AsyncEventQueueMBeanBridge(queue);
AsyncEventQueueMXBean queueMBean = new AsyncEventQueueMBean(bridge);
- ObjectName senderObjectName = MBeanJMXAdapter.getAsycnEventQueueMBeanName(
+ ObjectName senderObjectName = MBeanJMXAdapter.getAsyncEventQueueMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), queue.getId());
ObjectName changedMBeanName = service.registerInternalMBean(queueMBean, senderObjectName);
@@ -553,7 +554,7 @@ public class ManagementAdapter {
return;
}
- ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsycnEventQueueMBeanName(
+ ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsyncEventQueueMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), queue.getId());
AsyncEventQueueMBean bean;
try {
@@ -612,7 +613,7 @@ public class ManagementAdapter {
userData.put(JMXNotificationUserData.THREAD, source);
InternalDistributedMember sender = details.getSender();
- String nameOrId = memberSource; // TODO: what if sender is null?
+ String nameOrId = memberSource;
if (sender != null) {
nameOrId = sender.getName();
nameOrId = StringUtils.isNotBlank(nameOrId) ? nameOrId : sender.getId();
@@ -642,7 +643,7 @@ public class ManagementAdapter {
cacheServer.getPort(), internalCache.getDistributedSystem().getDistributedMember());
ObjectName changedMBeanName =
- service.registerInternalMBean((CacheServerMXBean) cacheServerMBean, cacheServerMBeanName);
+ service.registerInternalMBean(cacheServerMBean, cacheServerMBeanName);
ClientMembershipListener managementClientListener = new CacheServerMembershipListenerAdapter(
cacheServerMBean, memberLevelNotifEmitter, changedMBeanName);
@@ -895,8 +896,7 @@ public class ManagementAdapter {
LocatorMBeanBridge bridge = new LocatorMBeanBridge(locator);
LocatorMBean locatorMBean = new LocatorMBean(bridge);
- ObjectName changedMBeanName =
- service.registerInternalMBean((LocatorMXBean) locatorMBean, locatorMBeanName);
+ ObjectName changedMBeanName = service.registerInternalMBean(locatorMBean, locatorMBeanName);
service.federate(changedMBeanName, LocatorMXBean.class, true);
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
index dd24942..a62f926 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.beans.stats;
import java.lang.management.ManagementFactory;
import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.statistics.StatisticId;
import org.apache.geode.internal.statistics.StatisticNotFoundException;
import org.apache.geode.internal.statistics.StatisticsNotification;
@@ -30,9 +29,9 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
*/
public class VMStatsMonitor extends MBeanStatsMonitor {
- private volatile float cpuUsage = 0;
-
+ private static final int VALUE_NOT_AVAILABLE = -1;
+ private volatile float cpuUsage = 0;
private static String processCPUTimeAttr = "ProcessCpuTime";
@@ -47,7 +46,7 @@ public class VMStatsMonitor extends MBeanStatsMonitor {
processCPUTimeAvailable = MBeanJMXAdapter.isAttributeAvailable(processCPUTimeAttr,
ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME);
if (!processCPUTimeAvailable) {
- cpuUsage = MBeanJMXAdapter.VALUE_NOT_AVAILABLE;
+ cpuUsage = VALUE_NOT_AVAILABLE;
}
}
@@ -89,7 +88,7 @@ public class VMStatsMonitor extends MBeanStatsMonitor {
// Some JVM like IBM is not handled by Stats layer properly. Ignoring the attribute for such
// cases
if (processCpuTime == null) {
- cpuUsage = MBeanJMXAdapter.VALUE_NOT_AVAILABLE;
+ cpuUsage = VALUE_NOT_AVAILABLE;
return;
}
@@ -106,9 +105,8 @@ public class VMStatsMonitor extends MBeanStatsMonitor {
}
long systemTime = System.currentTimeMillis();
- long denom = (systemTime - lastSystemTime) * 10000; // 10000 = (Nano
- // conversion factor /
- // 100 for percentage)
+ // 10000 = (Nano conversion factor / 100 for percentage)
+ long denom = (systemTime - lastSystemTime) * 10000;
float processCpuUsage = (float) (cpuTime - lastProcessCpuTime) / denom;
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
index 8e9b54e..67f1b2b 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
@@ -75,7 +75,7 @@ public class CliUtil {
public static final FileFilter JAR_FILE_FILTER = new CustomFileFilter(".jar");
public static String cliDependenciesExist(boolean includeGfshDependencies) {
- String jarProductName = null;
+ String jarProductName;
// Parser & CliCommand from Spring Shell
jarProductName =
@@ -127,23 +127,22 @@ public class CliUtil {
}
public static byte[][] filesToBytes(String[] fileNames) throws IOException {
- List<byte[]> filesDataList = new ArrayList<byte[]>();
+ List<byte[]> filesDataList = new ArrayList<>();
- for (int i = 0; i < fileNames.length; i++) {
- File file = new File(fileNames[i]);
+ for (String fileName : fileNames) {
+ File file = new File(fileName);
if (!file.exists()) {
throw new FileNotFoundException("Could not find " + file.getCanonicalPath());
}
if (file.isDirectory()) {
- // TODO: (1) No recursive search yet. (2) Do we need to check/limit size of the files too?
File[] childrenFiles = file.listFiles(JAR_FILE_FILTER);
- for (int j = 0; j < childrenFiles.length; j++) {
+ for (File childrenFile : childrenFiles) {
// 1. add name of the file as bytes at even index
- filesDataList.add(childrenFiles[j].getName().getBytes());
+ filesDataList.add(childrenFile.getName().getBytes());
// 2. add file contents as bytes at odd index
- filesDataList.add(toByteArray(new FileInputStream(childrenFiles[j])));
+ filesDataList.add(toByteArray(new FileInputStream(childrenFile)));
}
} else {
filesDataList.add(file.getName().getBytes());
@@ -211,31 +210,21 @@ public class CliUtil {
}
}
- public static boolean isValidFileName(String filePath, String extension) {
- boolean isValid = true;
- return isValid;
- }
-
private static InternalCache getInternalCache() {
return (InternalCache) CacheFactory.getAnyInstance();
}
public static Set<String> getAllRegionNames() {
InternalCache cache = getInternalCache();
- Set<String> regionNames = new HashSet<String>();
+ Set<String> regionNames = new HashSet<>();
Set<Region<?, ?>> rootRegions = cache.rootRegions();
- Iterator<Region<?, ?>> rootRegionIters = rootRegions.iterator();
-
- while (rootRegionIters.hasNext()) {
- Region<?, ?> rootRegion = rootRegionIters.next();
+ for (Region<?, ?> rootRegion : rootRegions) {
regionNames.add(rootRegion.getFullPath().substring(1));
Set<Region<?, ?>> subRegions = rootRegion.subregions(true);
- Iterator<Region<?, ?>> subRegionIters = subRegions.iterator();
- while (subRegionIters.hasNext()) {
- Region<?, ?> subRegion = subRegionIters.next();
+ for (Region<?, ?> subRegion : subRegions) {
regionNames.add(subRegion.getFullPath().substring(1));
}
}
@@ -245,10 +234,8 @@ public class CliUtil {
public static String convertStringSetToString(Set<String> stringSet, char delimiter) {
StringBuilder sb = new StringBuilder();
if (stringSet != null) {
- Iterator<String> iters = stringSet.iterator();
- while (iters.hasNext()) {
- String stringValue = iters.next();
+ for (String stringValue : stringSet) {
sb.append(stringValue);
sb.append(delimiter);
}
@@ -259,10 +246,8 @@ public class CliUtil {
public static String convertStringListToString(List<String> stringList, char delimiter) {
StringBuilder sb = new StringBuilder();
if (stringList != null) {
- Iterator<String> iters = stringList.iterator();
- while (iters.hasNext()) {
- String stringValue = iters.next();
+ for (String stringValue : stringList) {
sb.append(stringValue);
sb.append(delimiter);
}
@@ -311,7 +296,7 @@ public class CliUtil {
return membersToConsider;
}
- Set<DistributedMember> matchingMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> matchingMembers = new HashSet<>();
// it will either go into this loop or the following loop, not both.
for (String memberNameOrId : members) {
for (DistributedMember member : membersToConsider) {
@@ -384,7 +369,7 @@ public class CliUtil {
}
public static <K> K newInstance(Class<K> klass, String neededFor) {
- K instance = null;
+ K instance;
try {
instance = klass.newInstance();
} catch (InstantiationException e) {
@@ -449,7 +434,6 @@ public class CliUtil {
System.arraycopy(buffer, 0, newResult, result.length, bytesRead);
result = newResult;
}
- // System.out.println(new String(result));
decompresser.end();
return new DeflaterInflaterData(result.length, result);
@@ -480,43 +464,6 @@ public class CliUtil {
}
}
- public static void main(String[] args) {
- try {
- byte[][] filesToBytes =
- filesToBytes(new String[] {"/export/abhishek1/work/aspenmm/GFTryouts/test.json"});
-
- System.out.println(filesToBytes[1].length);
-
- DeflaterInflaterData compressBytes = compressBytes(filesToBytes[1]);
- System.out.println(compressBytes);
-
- DeflaterInflaterData uncompressBytes =
- uncompressBytes(compressBytes.data, compressBytes.dataLength);
- System.out.println(uncompressBytes);
-
- System.out.println(new String(uncompressBytes.getData()));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (DataFormatException e) {
- e.printStackTrace();
- }
- }
-
- public static void main1(String[] args) {
- try {
- byte[][] fileToBytes = filesToBytes(new String[] {"../dumped/source/lib"});
-
- bytesToFiles(fileToBytes, "../dumped/dest/lib/", true);
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
public static boolean contains(Object[] array, Object object) {
boolean contains = false;
@@ -560,7 +507,7 @@ public class CliUtil {
*/
public static Set<DistributedMember> getDistributedMembersByGroup(InternalCache cache,
String[] groups) {
- Set<DistributedMember> groupMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> groupMembers = new HashSet<>();
for (String group : groups) {
groupMembers.addAll(
cache.getInternalDistributedSystem().getDistributionManager().getGroupMembers(group));
@@ -580,7 +527,7 @@ public class CliUtil {
*/
public static ResultCollector<?, ?> executeFunction(final Function function, Object args,
final Set<DistributedMember> targetMembers) {
- Execution execution = null;
+ Execution execution;
if (args != null) {
execution = FunctionService.onMembers(targetMembers).setArguments(args);
@@ -603,7 +550,7 @@ public class CliUtil {
*/
public static ResultCollector<?, ?> executeFunction(final Function function, Object args,
final DistributedMember targetMember) {
- Execution execution = null;
+ Execution execution;
if (args != null) {
execution = FunctionService.onMember(targetMember).setArguments(args);
@@ -635,9 +582,9 @@ public class CliUtil {
ManagementService managementService = ManagementService.getExistingManagementService(cache);
DistributedSystemMXBean distributedSystemMXBean =
managementService.getDistributedSystemMXBean();
- Set<DistributedMember> matchedMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> matchedMembers = new HashSet<>();
- Set<DistributedMember> allClusterMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> allClusterMembers = new HashSet<>();
allClusterMembers.addAll(cache.getMembers());
allClusterMembers.add(cache.getDistributedSystem().getDistributedMember());
@@ -647,8 +594,7 @@ public class CliUtil {
region) != null) {
matchedMembers.add(member);
}
- } catch (Exception e) {
- // ignore for now
+ } catch (Exception ignored) {
}
}
return matchedMembers;
@@ -729,7 +675,7 @@ public class CliUtil {
}
File file = null;
- FileWriter fw = null;
+ FileWriter fw;
try {
file = File.createTempFile("gfsh_output", "less");
fw = new FileWriter(file);
@@ -741,9 +687,7 @@ public class CliUtil {
"LESSOPEN=\"|color %s\" less -SR " + file.getName() + " < /dev/tty > /dev/tty "},
null, workingDir);
p.waitFor();
- } catch (IOException e) {
- Gfsh.printlnErr(e.getMessage());
- } catch (InterruptedException e) {
+ } catch (IOException | InterruptedException e) {
Gfsh.printlnErr(e.getMessage());
} finally {
if (file != null)
@@ -764,7 +708,7 @@ public class CliUtil {
public static Set<DistributedMember> getMembersForeRegionViaFunction(InternalCache cache,
String regionPath, boolean returnAll) {
try {
- Set<DistributedMember> regionMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> regionMembers = new HashSet<>();
MembersForRegionFunction membersForRegionFunction = new MembersForRegionFunction();
FunctionService.registerFunction(membersForRegionFunction);
Set<DistributedMember> targetMembers = CliUtil.getAllMembers(cache);
@@ -786,9 +730,7 @@ public class CliUtil {
}
if (object != null) {
Map<String, String> memberDetails = (Map<String, String>) object;
- Iterator<Entry<String, String>> it = memberDetails.entrySet().iterator();
- while (it.hasNext()) {
- Entry<String, String> entry = it.next();
+ for (Entry<String, String> entry : memberDetails.entrySet()) {
Set<DistributedMember> dsMems = CliUtil.getAllMembers(cache);
for (DistributedMember mem : dsMems) {
if (mem.getId().equals(entry.getKey())) {
@@ -802,7 +744,6 @@ public class CliUtil {
}
} catch (Exception ex) {
LogWrapper.getInstance().warning("getMembersForeRegionViaFunction exception " + ex);
- continue;
}
}
return regionMembers;
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
index 3f8f20d..790e54b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java
@@ -27,31 +27,16 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
public class CommandResponseBuilder {
public static CommandResponse prepareCommandResponse(String memberName, CommandResult result) {
- GfJsonObject content = null;
- try {
- content = result.getContent();
- } catch (GfJsonException e) {
- try {
- content = new GfJsonObject(e.getMessage());
- } catch (GfJsonException e1) {
- content = new GfJsonObject();
- }
- }
- return new CommandResponse(memberName, // sender
- getType(result), // contentType
- result.getStatus().getCode(), // status code
- "1/1", // page --- TODO - Abhishek - define a scrollable ResultData
- CliMetaData.ANNOTATION_NULL_VALUE, // tokenAccessor for next results
- getDebugInfo(result), // debugData
- result.getHeader(), // header
- content, // content
- result.getFooter(), // footer
- result.failedToPersist()); // failed to persist
+ GfJsonObject content;
+ content = result.getContent();
+ return new CommandResponse(memberName, getType(result), result.getStatus().getCode(), "1/1",
+ CliMetaData.ANNOTATION_NULL_VALUE, getDebugInfo(result), result.getHeader(), content,
+ result.getFooter(), result.failedToPersist());
}
// De-serializing to CommandResponse
public static CommandResponse prepareCommandResponseFromJson(String jsonString) {
- GfJsonObject jsonObject = null;
+ GfJsonObject jsonObject;
try {
jsonObject = new GfJsonObject(jsonString);
} catch (GfJsonException e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
index 157bb91..a22f615 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management.internal.cli;
-import java.io.IOException;
import java.io.PrintStream;
import java.util.HashSet;
import java.util.List;
@@ -94,7 +93,7 @@ public class Launcher {
protected Launcher() {
this.startupTimeLogHelper = new StartupTimeLogHelper();
- this.allowedCommandLineCommands = new HashSet<String>();
+ this.allowedCommandLineCommands = new HashSet<>();
this.allowedCommandLineCommands.add(CliStrings.RUN);
this.allowedCommandLineCommands.add(CliStrings.START_PULSE);
this.allowedCommandLineCommands.add(CliStrings.START_JCONSOLE);
@@ -141,10 +140,6 @@ public class Launcher {
try {
gfsh = Gfsh.getInstance(false, args, new GfshConfig());
this.startupTimeLogHelper.logStartupTime();
- } catch (ClassNotFoundException cnfex) {
- log(cnfex, gfsh);
- } catch (IOException ioex) {
- log(ioex, gfsh);
} catch (IllegalStateException isex) {
System.err.println("ERROR : " + isex.getMessage());
}
@@ -208,10 +203,6 @@ public class Launcher {
try {
gfsh = Gfsh.getInstance(launchShell, args, new GfshConfig());
this.startupTimeLogHelper.logStartupTime();
- } catch (ClassNotFoundException cnfex) {
- log(cnfex, gfsh);
- } catch (IOException ioex) {
- log(ioex, gfsh);
} catch (IllegalStateException isex) {
System.err.println("ERROR : " + isex.getMessage());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java
index 6aa4f74..2cd15f4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java
@@ -16,12 +16,12 @@ package org.apache.geode.management.internal.cli;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.StringWriter;
import java.text.BreakIterator;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.ConsoleHandler;
import java.util.logging.FileHandler;
-import java.util.logging.Filter;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.shell.GfshConfig;
*/
public class LogWrapper {
private static Object INSTANCE_LOCK = new Object();
- private volatile static LogWrapper INSTANCE = null;
+ private static volatile LogWrapper INSTANCE = null;
private Logger logger;
@@ -50,15 +50,9 @@ public class LogWrapper {
Cache cache = CliUtil.getCacheIfExists();
if (cache != null && !cache.isClosed()) {
- // TODO - Abhishek how to set different log levels for different handlers???
logger.addHandler(cache.getLogger().getHandler());
CommandResponseWriterHandler handler = new CommandResponseWriterHandler();
- handler.setFilter(new Filter() {
- @Override
- public boolean isLoggable(LogRecord record) {
- return record.getLevel().intValue() >= Level.FINE.intValue();
- }
- });
+ handler.setFilter(record -> record.getLevel().intValue() >= Level.FINE.intValue());
handler.setLevel(Level.FINE);
logger.addHandler(handler);
}
@@ -81,14 +75,12 @@ public class LogWrapper {
if (config.isLoggingEnabled()) {
try {
FileHandler fileHandler = new FileHandler(config.getLogFilePath(),
- config.getLogFileSizeLimit(), config.getLogFileCount(), true /* append */);
+ config.getLogFileSizeLimit(), config.getLogFileCount(), true);
fileHandler.setFormatter(new GemFireFormatter());
fileHandler.setLevel(config.getLogLevel());
logger.addHandler(fileHandler);
logger.setLevel(config.getLogLevel());
- } catch (SecurityException e) {
- addDefaultConsoleHandler(logger, e.getMessage(), config.getLogFilePath());
- } catch (IOException e) {
+ } catch (SecurityException | IOException e) {
addDefaultConsoleHandler(logger, e.getMessage(), config.getLogFilePath());
}
}
@@ -164,8 +156,7 @@ public class LogWrapper {
return logger.getLevel();
}
- // TODO - Abhishek - ideally shouldn't be exposed outside.
- /* package */ Logger getLogger() {
+ Logger getLogger() {
return logger;
}
@@ -185,19 +176,6 @@ public class LogWrapper {
}
}
- // TODO - Abhishek - Check whether we can use GemFireLevel.ERROR
- // public boolean errorEnabled() {
- // return severeEnabled();
- // }
- //
- // public void error(String message) {
- // logger.severe(message);
- // }
- //
- // public void error(String message, Throwable t) {
- // logger.log(Level.SEVERE, message, t);
- // }
-
public boolean warningEnabled() {
return logger.isLoggable(Level.WARNING);
}
@@ -298,15 +276,14 @@ public class LogWrapper {
*
* @since GemFire 7.0
*/
- // Formatter code "copied" from LogWriterImpl
static class GemFireFormatter extends Formatter {
- private final static String FORMAT = "yyyy/MM/dd HH:mm:ss.SSS z";
+ private static final String FORMAT = "yyyy/MM/dd HH:mm:ss.SSS z";
private SimpleDateFormat sdf = new SimpleDateFormat(FORMAT);
@Override
public synchronized String format(LogRecord record) {
- java.io.StringWriter sw = new java.io.StringWriter();
+ StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
pw.println();
@@ -348,10 +325,9 @@ public class LogWrapper {
pw.close();
try {
sw.close();
- } catch (java.io.IOException ignore) {
+ } catch (IOException ignore) {
}
- String result = sw.toString();
- return result;
+ return sw.toString();
}
private void formatText(PrintWriter writer, String target, int initialLength) {
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
index d0f2e5a..a75eeb0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java
@@ -22,14 +22,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_S
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.security.KeyStore;
+import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
-import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
@@ -69,9 +68,9 @@ import org.apache.geode.security.AuthenticationFailedException;
public class ConnectCommand implements GfshCommand {
// millis that connect --locator will wait for a response from the locator.
- public final static int CONNECT_LOCATOR_TIMEOUT_MS = 60000; // see bug 45971
+ static final int CONNECT_LOCATOR_TIMEOUT_MS = 60000; // see bug 45971
- static UserInputProperty[] USERINPUTPROPERTIES =
+ private static UserInputProperty[] USERINPUTPROPERTIES =
{UserInputProperty.KEYSTORE, UserInputProperty.KEYSTORE_PASSWORD,
UserInputProperty.KEYSTORE_TYPE, UserInputProperty.TRUSTSTORE,
UserInputProperty.TRUSTSTORE_PASSWORD, UserInputProperty.TRUSTSTORE_TYPE,
@@ -117,8 +116,7 @@ public class ConnectCommand implements GfshCommand {
help = CliStrings.CONNECT__USE_SSL__HELP) boolean useSsl,
@CliOption(key = {"skip-ssl-validation"}, specifiedDefaultValue = "true",
unspecifiedDefaultValue = "false",
- help = "When connecting via HTTP, connects using 1-way SSL validation rather than 2-way SSL validation.") boolean skipSslValidation)
- throws MalformedURLException {
+ help = "When connecting via HTTP, connects using 1-way SSL validation rather than 2-way SSL validation.") boolean skipSslValidation) {
Result result;
Gfsh gfsh = getGfsh();
@@ -213,10 +211,7 @@ public class ConnectCommand implements GfshCommand {
}
boolean isSslImpliedBySslOptions(String... sslOptions) {
- if (sslOptions == null) {
- return false;
- }
- return Arrays.stream(sslOptions).anyMatch(Objects::nonNull);
+ return sslOptions != null && Arrays.stream(sslOptions).anyMatch(Objects::nonNull);
}
Properties loadProperties(File... files) {
@@ -279,25 +274,22 @@ public class ConnectCommand implements GfshCommand {
return ResultBuilder.createInfoResult(
CliStrings.format(CliStrings.CONNECT__MSG__SUCCESS, operationInvoker.toString()));
- } catch (Exception e) {
- // all other exceptions, just logs it and returns a connection error
- if (!(e instanceof SecurityException) && !(e instanceof AuthenticationFailedException)) {
- return handleExcpetion(e, null);
- }
-
- // if it's security exception, and we already sent in username and password, still retuns the
+ } catch (SecurityException | AuthenticationFailedException e) {
+ // if it's security exception, and we already sent in username and password, still returns the
// connection error
if (gfProperties.containsKey(ResourceConstants.USER_NAME)) {
- return handleExcpetion(e, null);
+ return handleException(e);
}
- // otherwise, prompt for username and password and retry the conenction
+ // otherwise, prompt for username and password and retry the connection
gfProperties.setProperty(UserInputProperty.USERNAME.getKey(),
UserInputProperty.USERNAME.promptForAcceptableValue(gfsh));
gfProperties.setProperty(UserInputProperty.PASSWORD.getKey(),
UserInputProperty.PASSWORD.promptForAcceptableValue(gfsh));
return httpConnect(gfProperties, url);
-
+ } catch (Exception e) {
+ // all other exceptions, just logs it and returns a connection error
+ return handleException(e);
} finally {
Gfsh.redirectInternalJavaLoggers();
}
@@ -358,25 +350,22 @@ public class ConnectCommand implements GfshCommand {
LogWrapper.getInstance().info(CliStrings.format(CliStrings.CONNECT__MSG__SUCCESS,
jmxHostPortToConnect.toString(false)));
return ResultBuilder.buildResult(infoResultData);
- } catch (Exception e) {
- // all other exceptions, just logs it and returns a connection error
- if (!(e instanceof SecurityException) && !(e instanceof AuthenticationFailedException)) {
- return handleExcpetion(e, jmxHostPortToConnect);
- }
-
+ } catch (SecurityException | AuthenticationFailedException e) {
// if it's security exception, and we already sent in username and password, still returns the
// connection error
if (gfProperties.containsKey(ResourceConstants.USER_NAME)) {
- return handleExcpetion(e, jmxHostPortToConnect);
+ return handleException(e, jmxHostPortToConnect);
}
- // otherwise, prompt for username and password and retry the conenction
+ // otherwise, prompt for username and password and retry the connection
gfProperties.setProperty(UserInputProperty.USERNAME.getKey(),
UserInputProperty.USERNAME.promptForAcceptableValue(gfsh));
gfProperties.setProperty(UserInputProperty.PASSWORD.getKey(),
UserInputProperty.PASSWORD.promptForAcceptableValue(gfsh));
return jmxConnect(gfProperties, useSsl, jmxHostPortToConnect, null, true);
-
+ } catch (Exception e) {
+ // all other exceptions, just logs it and returns a connection error
+ return handleException(e, jmxHostPortToConnect);
} finally {
Gfsh.redirectInternalJavaLoggers();
}
@@ -448,7 +437,7 @@ public class ConnectCommand implements GfshCommand {
ssl.init(keyManagerFactory != null ? keyManagerFactory.getKeyManagers() : null,
trustManagerFactory != null ? trustManagerFactory.getTrustManagers() : null,
- new java.security.SecureRandom());
+ new SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(ssl.getSocketFactory());
} finally {
@@ -461,13 +450,20 @@ public class ConnectCommand implements GfshCommand {
}
}
- private Result handleExcpetion(Exception e, ConnectionEndpoint hostPortToConnect) {
- String errorMessage = e.getMessage();
- if (hostPortToConnect != null) {
- errorMessage = CliStrings.format(CliStrings.CONNECT__MSG__ERROR,
- hostPortToConnect.toString(false), e.getMessage());
- }
+ private Result handleException(Exception e) {
+ return handleException(e, e.getMessage());
+ }
+
+ private Result handleException(Exception e, String errorMessage) {
LogWrapper.getInstance().severe(errorMessage, e);
return ResultBuilder.createConnectionErrorResult(errorMessage);
}
+
+ private Result handleException(Exception e, ConnectionEndpoint hostPortToConnect) {
+ if (hostPortToConnect == null) {
+ return handleException(e);
+ }
+ return handleException(e, CliStrings.format(CliStrings.CONNECT__MSG__ERROR,
+ hostPortToConnect.toString(false), e.getMessage()));
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
index d2f9371..fca84a7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
@@ -44,6 +44,7 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.LogWrapper;
+import org.apache.geode.management.internal.cli.converters.RegionPathConverter;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.InfoResultData;
@@ -159,7 +160,7 @@ public class ShellCommands implements GfshCommand {
@CliCommand(value = {CliStrings.EXIT, "quit"}, help = CliStrings.EXIT__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH})
- public ExitShellRequest exit() throws IOException {
+ public ExitShellRequest exit() {
Gfsh gfshInstance = getGfsh();
gfshInstance.stop();
@@ -179,7 +180,7 @@ public class ShellCommands implements GfshCommand {
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX,
CliStrings.TOPIC_GEODE_MANAGER})
public Result disconnect() {
- Result result = null;
+ Result result;
if (getGfsh() != null && !getGfsh().isConnectedAndReady()) {
result = ResultBuilder.createInfoResult("Not connected.");
@@ -195,8 +196,7 @@ public class ShellCommands implements GfshCommand {
operationInvoker.toString()));
LogWrapper.getInstance().info(CliStrings.format(CliStrings.DISCONNECT__MSG__DISCONNECTED,
operationInvoker.toString()));
- gfshInstance.setPromptPath(
- org.apache.geode.management.internal.cli.converters.RegionPathConverter.DEFAULT_APP_CONTEXT_PATH);
+ gfshInstance.setPromptPath(RegionPathConverter.DEFAULT_APP_CONTEXT_PATH);
} else {
infoResultData.addLine(CliStrings.DISCONNECT__MSG__NOTCONNECTED);
}
@@ -213,13 +213,12 @@ public class ShellCommands implements GfshCommand {
@CliCommand(value = {CliStrings.DESCRIBE_CONNECTION}, help = CliStrings.DESCRIBE_CONNECTION__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX})
public Result describeConnection() {
- Result result = null;
+ Result result;
try {
TabularResultData tabularResultData = ResultBuilder.createTabularResultData();
Gfsh gfshInstance = getGfsh();
if (gfshInstance.isConnectedAndReady()) {
OperationInvoker operationInvoker = gfshInstance.getOperationInvoker();
- // tabularResultData.accumulate("Monitored GemFire DS", operationInvoker.toString());
tabularResultData.accumulate("Connection Endpoints", operationInvoker.toString());
} else {
tabularResultData.accumulate("Connection Endpoints", "Not connected");
@@ -238,7 +237,7 @@ public class ShellCommands implements GfshCommand {
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH})
public Result echo(@CliOption(key = {CliStrings.ECHO__STR, ""}, specifiedDefaultValue = "",
mandatory = true, help = CliStrings.ECHO__STR__HELP) String stringToEcho) {
- Result result = null;
+ Result result;
if (stringToEcho.equals("$*")) {
Gfsh gfshInstance = getGfsh();
@@ -256,10 +255,8 @@ public class ShellCommands implements GfshCommand {
TabularResultData buildResultForEcho(Set<Entry<String, String>> propertyMap) {
TabularResultData resultData = ResultBuilder.createTabularResultData();
- Iterator<Entry<String, String>> it = propertyMap.iterator();
- while (it.hasNext()) {
- Entry<String, String> setEntry = it.next();
+ for (Entry<String, String> setEntry : propertyMap) {
resultData.accumulate("Property", setEntry.getKey());
resultData.accumulate("Value", String.valueOf(setEntry.getValue()));
}
@@ -273,7 +270,7 @@ public class ShellCommands implements GfshCommand {
help = CliStrings.SET_VARIABLE__VAR__HELP) String var,
@CliOption(key = CliStrings.SET_VARIABLE__VALUE, mandatory = true,
help = CliStrings.SET_VARIABLE__VALUE__HELP) String value) {
- Result result = null;
+ Result result;
try {
getGfsh().setEnvProperty(var, String.valueOf(value));
result =
@@ -329,7 +326,7 @@ public class ShellCommands implements GfshCommand {
} else {
// Process file option
Gfsh gfsh = Gfsh.getCurrentInstance();
- ErrorResultData errorResultData = null;
+ ErrorResultData errorResultData;
StringBuilder contents = new StringBuilder();
Writer output = null;
@@ -344,7 +341,7 @@ public class ShellCommands implements GfshCommand {
while (it.hasNext()) {
String line = it.next().toString();
- if (line.isEmpty() == false) {
+ if (!line.isEmpty()) {
if (flagForLineNumbers) {
lineNumber++;
contents.append(String.format("%" + historySizeWordLength + "s ", lineNumber));
@@ -429,7 +426,7 @@ public class ShellCommands implements GfshCommand {
@CliOption(key = {CliStrings.RUN__CONTINUEONERROR}, specifiedDefaultValue = "true",
unspecifiedDefaultValue = "false",
help = CliStrings.RUN__CONTINUEONERROR__HELP) boolean continueOnError) {
- Result result = null;
+ Result result;
Gfsh gfsh = Gfsh.getCurrentInstance();
try {
@@ -457,7 +454,7 @@ public class ShellCommands implements GfshCommand {
try {
LogWrapper.getInstance().fine("Sleeping for " + time + "seconds.");
Thread.sleep(Math.round(time * 1000));
- } catch (InterruptedException ignorable) {
+ } catch (InterruptedException ignored) {
}
return ResultBuilder.createInfoResult("");
}
@@ -470,15 +467,11 @@ public class ShellCommands implements GfshCommand {
@CliOption(key = CliStrings.SH__USE_CONSOLE, specifiedDefaultValue = "true",
unspecifiedDefaultValue = "false",
help = CliStrings.SH__USE_CONSOLE__HELP) boolean useConsole) {
- Result result = null;
+ Result result;
try {
result =
ResultBuilder.buildResult(executeCommand(Gfsh.getCurrentInstance(), command, useConsole));
- } catch (IllegalStateException e) {
- result = ResultBuilder.createUserErrorResult(e.getMessage());
- LogWrapper.getInstance()
- .warning("Unable to execute command \"" + command + "\". Reason:" + e.getMessage() + ".");
- } catch (IOException e) {
+ } catch (IllegalStateException | IOException e) {
result = ResultBuilder.createUserErrorResult(e.getMessage());
LogWrapper.getInstance()
.warning("Unable to execute command \"" + command + "\". Reason:" + e.getMessage() + ".");
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java
index 6236b38..7db3155 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java
@@ -396,9 +396,6 @@ public class ShowMetricsCommand implements GfshCommand {
csvBuilder);
writeToTableAndCsv(metricsTable, "", "putAllAvgLatency", memberMxBean.getPutAllAvgLatency(),
csvBuilder);
- // Not available from stats. After Stats re-org it will be available
- // writeToTableAndCsv(metricsTable, "", "getAllAvgLatency",
- // memberMxBean.getGetAllAvgLatency(), csvBuilder);
writeToTableAndCsv(metricsTable, "", "totalMissCount", memberMxBean.getTotalMissCount(),
csvBuilder);
writeToTableAndCsv(metricsTable, "", "totalHitCount", memberMxBean.getTotalHitCount(),
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
index 3e1053a..44d32a4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java
@@ -29,6 +29,7 @@ import java.util.Properties;
import javax.management.MalformedObjectNameException;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.GemFireVersion;
@@ -102,7 +103,7 @@ public class StartMemberUtils {
for (final Object property : gemfireProperties.keySet()) {
final String propertyName = property.toString();
final String propertyValue = gemfireProperties.getProperty(propertyName);
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(propertyValue)) {
+ if (StringUtils.isNotBlank(propertyValue)) {
commandLine.add(
"-D" + DistributionConfig.GEMFIRE_PREFIX + "" + propertyName + "=" + propertyValue);
}
@@ -117,26 +118,24 @@ public class StartMemberUtils {
}
static void addInitialHeap(final List<String> commandLine, final String initialHeap) {
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(initialHeap)) {
+ if (StringUtils.isNotBlank(initialHeap)) {
commandLine.add("-Xms" + initialHeap);
}
}
static void addMaxHeap(final List<String> commandLine, final String maxHeap) {
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(maxHeap)) {
+ if (StringUtils.isNotBlank(maxHeap)) {
commandLine.add("-Xmx" + maxHeap);
commandLine.add("-XX:+UseConcMarkSweepGC");
commandLine.add("-XX:CMSInitiatingOccupancyFraction=" + CMS_INITIAL_OCCUPANCY_FRACTION);
- // commandLine.add("-XX:MinHeapFreeRatio=" + MINIMUM_HEAP_FREE_RATIO);
}
}
static void addCurrentLocators(GfshCommand gfshCommand, final List<String> commandLine,
final Properties gemfireProperties) throws MalformedObjectNameException {
- if (org.apache.geode.internal.lang.StringUtils
- .isBlank(gemfireProperties.getProperty(LOCATORS))) {
+ if (StringUtils.isBlank(gemfireProperties.getProperty(LOCATORS))) {
String currentLocators = getCurrentLocators(gfshCommand);
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(currentLocators)) {
+ if (StringUtils.isNotBlank(currentLocators)) {
commandLine.add("-D".concat(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX)
.concat(LOCATORS).concat("=").concat(currentLocators));
}
@@ -209,9 +208,8 @@ public class StartMemberUtils {
// System CLASSPATH environment variable setting, which is consistent with the Java platform
// behavior...
for (String userClasspath : userClasspaths) {
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(userClasspath)) {
- classpath.append((classpath.length() == 0)
- ? org.apache.geode.internal.lang.StringUtils.EMPTY : File.pathSeparator);
+ if (StringUtils.isNotBlank(userClasspath)) {
+ classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator);
classpath.append(userClasspath);
}
}
@@ -227,9 +225,8 @@ public class StartMemberUtils {
// And finally, include all GemFire dependencies on the CLASSPATH...
for (String jarFilePathname : jarFilePathnames) {
- if (org.apache.geode.internal.lang.StringUtils.isNotBlank(jarFilePathname)) {
- classpath.append((classpath.length() == 0)
- ? org.apache.geode.internal.lang.StringUtils.EMPTY : File.pathSeparator);
+ if (StringUtils.isNotBlank(jarFilePathname)) {
+ classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator);
classpath.append(jarFilePathname);
}
}
@@ -240,7 +237,6 @@ public class StartMemberUtils {
String classpath = getSystemClasspath();
String gemfireJarPath = GEODE_JAR_PATHNAME;
for (String classpathElement : classpath.split(File.pathSeparator)) {
- // MUST CHANGE THIS TO REGEX SINCE VERSION CHANGES IN JAR NAME
if (classpathElement.endsWith("gemfire-core-8.2.0.0-SNAPSHOT.jar")) {
gemfireJarPath = classpathElement;
break;
[2/3] geode git commit: GEODE-3472: Remove a great deal of
commented-out code.
Posted by ji...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
index 96690e8..e961911 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/MemberGroupConverter.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
* @since GemFire 7.0
@@ -34,20 +34,17 @@ public class MemberGroupConverter implements Converter<String> {
@Override
public boolean supports(Class<?> type, String optionContext) {
- // System.out.println("MemberGroupConverter.supports("+type+","+optionContext+")");
return String.class.equals(type) && ConverterHint.MEMBERGROUP.equals(optionContext);
}
@Override
public String convertFromText(String value, Class<?> targetType, String optionContext) {
- // System.out.println("MemberGroupConverter.convertFromText("+value+","+targetType+","+optionContext+")");
return value;
}
@Override
public boolean getAllPossibleValues(List<Completion> completions, Class<?> targetType,
String existingData, String optionContext, MethodTarget target) {
- // System.out.println("MemberGroupConverter.getAllPossibleValues("+existingData+","+targetType+","+optionContext+")");
if (String.class.equals(targetType) && ConverterHint.MEMBERGROUP.equals(optionContext)) {
String[] memberGroupNames = getMemberGroupNames();
@@ -60,7 +57,7 @@ public class MemberGroupConverter implements Converter<String> {
public Set<String> getMemberGroups() {
final Gfsh gfsh = Gfsh.getCurrentInstance();
- final Set<String> memberGroups = new TreeSet<String>();
+ final Set<String> memberGroups = new TreeSet<>();
if (gfsh != null && gfsh.isConnectedAndReady()) {
final String[] memberGroupsArray =
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
index b682767..5ad88c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
@@ -44,9 +44,9 @@ import org.apache.geode.management.internal.cli.util.JsonUtil;
/**
- * Domain object used for Data Commands Functions TODO : Implement DataSerializable
+ * Domain object used for Data Commands Functions
*/
-public class DataCommandResult implements /* Data */ Serializable {
+public class DataCommandResult implements Serializable {
private static Logger logger = LogManager.getLogger();
private static final long serialVersionUID = 1L;
@@ -260,7 +260,6 @@ public class DataCommandResult implements /* Data */ Serializable {
DataCommandResult result = new DataCommandResult();
result.command = CliStrings.QUERY;
result.inputQuery = inputQuery;
- // result.limit = limit;
result.queryTraceString = queryTraceString;
result.selectResult = value;
result.error = error;
@@ -390,7 +389,6 @@ public class DataCommandResult implements /* Data */ Serializable {
}
if (errorString != null) {
- // return ResultBuilder.createGemFireErrorResult(errorString);
CompositeResultData data = ResultBuilder.createCompositeResultData();
SectionResultData section = data.addSection();
section.addData("Message", errorString);
@@ -415,8 +413,6 @@ public class DataCommandResult implements /* Data */ Serializable {
toCommandResult_isPut(section, table);
} else if (isRemove()) {
toCommandResult_isRemove(section, table);
- } else if (isSelect()) {
- // its moved to its separate method
}
return ResultBuilder.buildResult(data);
}
@@ -457,7 +453,6 @@ public class DataCommandResult implements /* Data */ Serializable {
if (locations != null) {
if (locations.size() == 1) {
Object array[] = locations.get(0);
- // String regionPath = (String)array[0];
boolean found = (Boolean) array[1];
if (found) {
totalLocations++;
@@ -537,11 +532,10 @@ public class DataCommandResult implements /* Data */ Serializable {
* This method returns result when flag interactive=false i.e. Command returns result in one go
* and does not goes through steps waiting for user input. Method returns CompositeResultData
* instead of Result as Command Step is required to add NEXT_STEP information to guide
- * executionStragey to route it through final step.
+ * executionStrategy to route it through final step.
*/
public CompositeResultData toSelectCommandResult() {
if (errorString != null) {
- // return ResultBuilder.createGemFireErrorResult(errorString);
CompositeResultData data = ResultBuilder.createCompositeResultData();
SectionResultData section = data.addSection();
section.addData("Message", errorString);
@@ -613,7 +607,6 @@ public class DataCommandResult implements /* Data */ Serializable {
try {
tableRow.put(key, MISSING_VALUE);
} catch (GfJsonException e) {
- // TODO: Address this unlikely possibility.
logger.warn("Ignored GfJsonException:", e);
}
}
@@ -816,7 +809,6 @@ public class DataCommandResult implements /* Data */ Serializable {
if (result == null) {// self-transform result from single to aggregate when numMember==1
if (this.locateEntryResult != null) {
locateEntryLocations.add(locateEntryResult);
- // TODO : Decide whether to show value or not this.getResult = locateEntryResult.getValue();
}
return;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/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 96f8815..82a7adf 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
@@ -14,10 +14,8 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -26,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
-import org.apache.shiro.subject.Subject;
import org.json.JSONArray;
import org.apache.geode.cache.CacheFactory;
@@ -211,8 +208,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
QueryService qs = cache.getQueryService();
- // TODO : Find out if is this optimised use. Can you have something equivalent of parsed
- // queries with names where name can be retrieved to avoid parsing every-time
Query query = qs.newQuery(queryString);
DefaultQuery tracedQuery = (DefaultQuery) query;
WrappedIndexTrackingQueryObserver queryObserver = null;
@@ -385,7 +380,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
if (logger.isDebugEnabled()) {
logger.debug("Removed key {} successfully", key);
}
- // return DataCommandResult.createRemoveResult(key, value, null, null);
Object array[] = getJSONForNonPrimitiveObject(value);
DataCommandResult result =
DataCommandResult.createRemoveResult(key, array[1], null, null, true);
@@ -450,8 +444,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
"Error in converting JSON " + e.getMessage(), false);
}
- // TODO determine whether the following conditional logic (assigned to 'doGet') is safer or
- // necessary
boolean doGet = Boolean.TRUE.equals(loadOnCacheMiss);
if (doGet || region.containsKey(keyObject)) {
@@ -465,7 +457,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
if (logger.isDebugEnabled()) {
logger.debug("Get for key {} value {}", key, value);
}
- // return DataCommandResult.createGetResult(key, value, null, null);
Object array[] = getJSONForNonPrimitiveObject(value);
if (value != null) {
DataCommandResult result =
@@ -723,7 +714,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
Object value = object.get(key);
if (GfJsonObject.isJSONKind(value)) {
GfJsonObject jsonVal = new GfJsonObject(value);
- // System.out.println("Re-wrote inner object");
try {
if (jsonVal.has("type-class")) {
object.put(key, jsonVal.get("type-class"));
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index 7562005..5e97976 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -350,10 +350,7 @@ public class CliStrings {
"Fully qualified class name of a plug-in to be instantiated for receiving before-event notification of changes to the region and its entries. The plug-in may cancel the event. At most, one cache writer can be defined in each member for the region.";
public static final String ALTER_REGION__ASYNCEVENTQUEUEID = "async-event-queue-id";
public static final String ALTER_REGION__ASYNCEVENTQUEUEID__HELP =
- "IDs of the Async Event Queues that will be used for write-behind operations."; // TODO -
- // Abhishek Is
- // this
- // correct?
+ "IDs of the Async Event Queues that will be used for write-behind operations.";
public static final String ALTER_REGION__GATEWAYSENDERID = "gateway-sender-id";
public static final String ALTER_REGION__GATEWAYSENDERID__HELP =
"IDs of the Gateway Senders to which data will be routed.";
@@ -527,8 +524,8 @@ public class CliStrings {
"This disk store is in use by other process. \"" + CliStrings.COMPACT_DISK_STORE
+ "\" can be used to compact disk store that is current in use.";
public static final String COMPACT_OFFLINE_DISK_STORE__MSG__CANNOT_ACCESS_DISKSTORE_0_FROM_1_CHECK_GFSH_LOGS =
- "Can not access disk store \"{0}\" from \"{1}\". Check "
- + org.apache.geode.management.internal.cli.shell.Gfsh.GFSH_APP_NAME + " logs for error.";
+ "Can not access disk store \"{0}\" from \"{1}\". Check " + Gfsh.GFSH_APP_NAME
+ + " logs for error.";
public static final String COMPACT_OFFLINE_DISK_STORE__MSG__ERROR_WHILE_COMPACTING_DISKSTORE_0_WITH_1_REASON_2 =
"While compacting disk store={0} {1}. Reason: {2}";
@@ -885,10 +882,7 @@ public class CliStrings {
"Fully qualified class name of a plug-in to be instantiated for receiving before-event notification of changes to the region and its entries. The plug-in may cancel the event. At most, one cache writer can be defined in each member for the region.";
public static final String CREATE_REGION__ASYNCEVENTQUEUEID = "async-event-queue-id";
public static final String CREATE_REGION__ASYNCEVENTQUEUEID__HELP =
- "IDs of the Async Event Queues that will be used for write-behind operations."; // TODO -
- // Abhishek Is
- // this
- // correct?
+ "IDs of the Async Event Queues that will be used for write-behind operations.";
public static final String CREATE_REGION__GATEWAYSENDERID = "gateway-sender-id";
public static final String CREATE_REGION__GATEWAYSENDERID__HELP =
"IDs of the Gateway Senders to which data will be routed.";
@@ -985,14 +979,7 @@ public class CliStrings {
"Could not access class \"{0}\" specified for \"{1}\".";
public static final String CREATE_REGION__MSG__EXPIRATION_ACTION_0_IS_NOT_VALID =
"Expiration action \"{0}\" is not valid.";
- public static final String CREATE_REGION__MSG__ERROR_ON_MEMBER_0 = "Error on member: {0}. "; // leave
- // space
- // in
- // the
- // end
- // for
- // further
- // message
+ public static final String CREATE_REGION__MSG__ERROR_ON_MEMBER_0 = "Error on member: {0}. ";
public static final String CREATE_REGION__MSG__COULD_NOT_RETRIEVE_REGION_ATTRS_FOR_PATH_0_REASON_1 =
"Could not retrieve region attributes for given path \"{0}\". Reason: {1}";
public static final String CREATE_REGION__MSG__COULD_NOT_RETRIEVE_REGION_ATTRS_FOR_PATH_0_VERIFY_REGION_EXISTS =
@@ -2333,12 +2320,7 @@ public class CliStrings {
public static final String START_LOCATOR__PORT__HELP = "Port the Locator will listen on.";
public static final String START_LOCATOR__PROPERTIES = "properties-file";
public static final String START_LOCATOR__PROPERTIES__HELP =
- "The gemfire.properties file for configuring the Locator's distributed system. The file's path can be absolute or relative to the gfsh working directory (--dir=)."; // TODO:GEODE-1466:
- // update
- // golden
- // file
- // to
- // geode.properties
+ "The gemfire.properties file for configuring the Locator's distributed system. The file's path can be absolute or relative to the gfsh working directory (--dir=).";
public static final String START_LOCATOR__SECURITY_PROPERTIES = "security-properties-file";
public static final String START_LOCATOR__SECURITY_PROPERTIES__HELP =
"The gfsecurity.properties file for configuring the Locator's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory (--dir=).";
@@ -2500,12 +2482,7 @@ public class CliStrings {
"The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates whether the size should be interpreted as gigabytes or megabytes. A non-zero size causes that much memory to be allocated from the operating system and reserved for off-heap use.";
public static final String START_SERVER__PROPERTIES = "properties-file";
public static final String START_SERVER__PROPERTIES__HELP =
- "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory."; // TODO:GEODE-1466:
- // update
- // golden
- // file
- // to
- // geode.properties
+ "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory.";
public static final String START_SERVER__REDIS_PORT = ConfigurationProperties.REDIS_PORT;
public static final String START_SERVER__REDIS_PORT__HELP =
"Sets the port that the Geode Redis service listens on for Redis clients.";
@@ -2515,8 +2492,7 @@ public class CliStrings {
"Sets the IP address the Geode Redis service listens on for Redis clients. The default is to bind to the first non-loopback address for this machine.";
public static final String START_SERVER__REDIS_PASSWORD = ConfigurationProperties.REDIS_PASSWORD;
public static final String START_SERVER__REDIS_PASSWORD__HELP =
- "Sets the authentication password for GeodeRedisServer"; // TODO:GEODE-1566: update golden
- // file to GeodeRedisServer
+ "Sets the authentication password for GeodeRedisServer";
public static final String START_SERVER__SECURITY_PROPERTIES = "security-properties-file";
public static final String START_SERVER__SECURITY_PROPERTIES__HELP =
"The gfsecurity.properties file for configuring the Server's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory.";
@@ -2536,10 +2512,6 @@ public class CliStrings {
public static final String START_SERVER__STATISTIC_ARCHIVE_FILE = STATISTIC_ARCHIVE_FILE;
public static final String START_SERVER__STATISTIC_ARCHIVE_FILE__HELP =
"The file that statistic samples are written to. An empty string (default) disables statistic archival.";
- // public static final String START_SERVER__START_LOCATOR = "start-locator";
- // public static final String START_SERVER__START_LOCATOR__HELP =
- // "To start embedded Locator with given endpoints in the format: host[port]. If no endpoints are
- // given defaults (localhost[10334]) are assumed.";
public static final String START_SERVER__USE_CLUSTER_CONFIGURATION = USE_CLUSTER_CONFIGURATION;
public static final String START_SERVER__USE_CLUSTER_CONFIGURATION__HELP =
"When set to true, the server requests the configuration from locator's cluster configuration service.";
@@ -2569,15 +2541,6 @@ public class CliStrings {
public static final String START_SERVER__EVICTION_OFF_HEAP_PERCENTAGE__HELP =
"Set the percentage of off-heap memory at or above which the eviction should begin on Regions configured for off-heap and HeapLRU eviction. Changing this value may cause eviction to begin immediately."
+ " Only one change to this attribute or critical off-heap percentage will be allowed at any given time and its effect will be fully realized before the next change is allowed.";
- // cacheServer.setLoadPollInterval(loadPollInterval)
- // cacheServer.setLoadProbe(loadProbe);
- // cacheServer.setMaxConnections(maxCons);
- // cacheServer.setMaximumMessageCount(maxMessageCount);
- // cacheServer.setMaximumTimeBetweenPings(maximumTimeBetweenPings);
- // cacheServer.setMaxThreads(maxThreads);
- // cacheServer.setMessageTimeToLive(messageTimeToLive);
- // cacheServer.setSocketBufferSize(socketBufferSize)
- // cacheServer.setTcpNoDelay(noDelay)
public static final String START_SERVER__HOSTNAME__FOR__CLIENTS = "hostname-for-clients";
public static final String START_SERVER__HOSTNAME__FOR__CLIENTS__HELP =
"Sets the ip address or host name that this cache server is to listen on for client connections."
@@ -3017,7 +2980,6 @@ public class CliStrings {
/***
* Cluster Configuration commands
*/
- // TODO: Jared - clean up messages
public static final String EXPORT_SHARED_CONFIG = "export cluster-configuration";
public static final String EXPORT_SHARED_CONFIG__HELP =
"Exports the cluster configuration artifacts as a zip file.";
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
index 42e3f08..fd4ebb7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutionContext.java
@@ -27,10 +27,9 @@ import org.apache.geode.management.internal.cli.shell.Gfsh;
*/
public class CommandExecutionContext {
// ThreadLocal variables that can be uses by commands
- private static final ThreadLocal<Map<String, String>> ENV =
- new ThreadLocal<Map<String, String>>();
- private static final ThreadLocal<Boolean> FROM_SHELL = new ThreadLocal<Boolean>();
- private static final ThreadLocal<byte[][]> SHELL_BYTES_DATA = new ThreadLocal<byte[][]>();
+ private static final ThreadLocal<Map<String, String>> ENV = new ThreadLocal<>();
+ private static final ThreadLocal<Boolean> FROM_SHELL = new ThreadLocal<>();
+ private static final ThreadLocal<byte[][]> SHELL_BYTES_DATA = new ThreadLocal<>();
private static final WrapperThreadLocal<CommandResponseWriter> WRITER_WRAPPER =
new WrapperThreadLocal<CommandResponseWriter>() {
@@ -48,10 +47,6 @@ public class CommandExecutionContext {
}
return propertyValue != null ? propertyValue : defaultValue;
}
- // Enable when "use region" command is required. See #46110
- // public static String getShellContextPath() {
- // return getShellEnvProperty(CliConstants.ENV_APP_CONTEXT_PATH, null);
- // }
public static int getShellFetchSize() {
int fetchSize = Gfsh.DEFAULT_APP_FETCH_SIZE;
@@ -75,8 +70,6 @@ public class CommandExecutionContext {
}
}
- // TODO - Abhishek make this protected & move caller code of this method
- // from MemberMBeanBridge to MemberCommandService
public static void setShellEnv(Map<String, String> env) {
ENV.set(env);
}
@@ -93,8 +86,6 @@ public class CommandExecutionContext {
return FROM_SHELL.get() != null && FROM_SHELL.get();
}
- // TODO - Abhishek make this protected & move caller code of this method
- // from MemberMBeanBridge to MemberCommandService
public static void setShellRequest() {
FROM_SHELL.set(true);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
index 0d1d91b..0bb96cf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/AbstractResultData.java
@@ -14,24 +14,25 @@
*/
package org.apache.geode.management.internal.cli.result;
-import org.apache.geode.management.cli.Result.Status;
-import org.apache.geode.management.internal.cli.CliUtil;
-import org.apache.geode.management.internal.cli.CliUtil.DeflaterInflaterData;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.json.GfJsonArray;
-import org.apache.geode.management.internal.cli.json.GfJsonException;
-import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.sql.Time;
import java.text.MessageFormat;
import java.util.Base64;
import java.util.zip.DataFormatException;
+import org.apache.geode.management.cli.Result.Status;
+import org.apache.geode.management.internal.cli.CliUtil;
+import org.apache.geode.management.internal.cli.CliUtil.DeflaterInflaterData;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.json.GfJsonArray;
+import org.apache.geode.management.internal.cli.json.GfJsonException;
+import org.apache.geode.management.internal.cli.json.GfJsonObject;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
/**
*
*
@@ -123,7 +124,7 @@ public abstract class AbstractResultData implements ResultData {
}
private static String addTimeStampBeforeLastDot(String src) {
- String toAdd = String.valueOf(new java.sql.Time(System.currentTimeMillis()));
+ String toAdd = String.valueOf(new Time(System.currentTimeMillis()));
toAdd = "-" + toAdd.replaceAll(":", "_");
int lastIndexOf = src.lastIndexOf(".");
@@ -147,11 +148,10 @@ public abstract class AbstractResultData implements ResultData {
public ResultData addAsFile(String fileName, byte[] data, int fileType, String message,
boolean addTimeStampToName) {
- byte[] bytes = data;
if (addTimeStampToName) {
fileName = addTimeStampBeforeLastDot(fileName);
}
- return addAsFile(fileName, bytes, fileType, message);
+ return addAsFile(fileName, data, fileType, message);
}
private ResultData addAsFile(String fileName, byte[] data, int fileType, String message) {
@@ -191,11 +191,8 @@ public abstract class AbstractResultData implements ResultData {
throws GfJsonException, DataFormatException, IOException {
boolean overwriteAllExisting = false;
int length = byteDataArray.size();
- String options = length > 1 ? "(y/N/a)" : "(y/N)"; // TODO - Abhishek Make this consistent -
- // with
- // AbstractCliAroundInterceptor.readYesNo()
-
- BYTEARRAY_LOOP: for (int i = 0; i < length; i++) {
+ String options = length > 1 ? "(y/N/a)" : "(y/N)";
+ for (int i = 0; i < length; i++) {
GfJsonObject object = byteDataArray.getJSONObject(i);
int fileType = object.getInt(FILE_TYPE_FIELD);
@@ -205,8 +202,8 @@ public abstract class AbstractResultData implements ResultData {
}
// build file name
- byte[] fileNameBytes = null;
- String fileName = null;
+ byte[] fileNameBytes;
+ String fileName;
GfJsonArray fileNameJsonBytes = object.getJSONArray(FILE_NAME_FIELD);
if (fileNameJsonBytes != null) { // if in gfsh
fileNameBytes = GfJsonArray.toByteArray(fileNameJsonBytes);
@@ -216,8 +213,8 @@ public abstract class AbstractResultData implements ResultData {
}
// build file message
- byte[] fileMessageBytes = null;
- String fileMessage = null;
+ byte[] fileMessageBytes;
+ String fileMessage;
GfJsonArray fileMessageJsonBytes = object.getJSONArray(FILE_MESSAGE);
if (fileMessageJsonBytes != null) { // if in gfsh
fileMessageBytes = GfJsonArray.toByteArray(fileMessageJsonBytes);
@@ -247,7 +244,7 @@ public abstract class AbstractResultData implements ResultData {
if (fileToDumpData.exists()) {
String fileExistsMessage =
CliStrings.format(CliStrings.ABSTRACTRESULTDATA__MSG__FILE_WITH_NAME_0_EXISTS_IN_1,
- new Object[] {fileName, fileToDumpData.getParent(), options});
+ fileName, fileToDumpData.getParent(), options);
if (gfsh != null && !gfsh.isQuietMode() && !overwriteAllExisting) {
fileExistsMessage = fileExistsMessage + " Overwrite? " + options + " : ";
String interaction = gfsh.interact(fileExistsMessage);
@@ -255,7 +252,7 @@ public abstract class AbstractResultData implements ResultData {
overwriteAllExisting = true;
} else if (!"y".equalsIgnoreCase(interaction.trim())) {
// do not save file & continue
- continue BYTEARRAY_LOOP;
+ continue;
}
} else {
throw new IOException(fileExistsMessage);
@@ -289,18 +286,14 @@ public abstract class AbstractResultData implements ResultData {
fos.flush();
fos.close();
}
- // System.out.println("fileMessage :: "+fileMessage);
if (fileMessage != null && !fileMessage.isEmpty()) {
if (gfsh != null) {
- Gfsh.println(
- MessageFormat.format(fileMessage, new Object[] {fileToDumpData.getAbsolutePath()}));
+ Gfsh.println(MessageFormat.format(fileMessage, fileToDumpData.getAbsolutePath()));
}
}
- // System.out.println(new String(uncompressed));
}
}
- // TODO - Abhishek : prepare common utility for this & ANSI Styling
static void handleCondition(String message) throws IOException {
Gfsh gfsh = Gfsh.getCurrentInstance();
// null check required in GfshVM too to avoid test issues
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
index 00f1fd9..bbb59d0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
@@ -38,7 +38,7 @@ import org.apache.geode.management.internal.cli.result.TableBuilder.Table;
*
* @since GemFire 7.0
*/
-// Should this have info about the command String??
+
public class CommandResult implements Result {
private GfJsonObject gfJsonObject;
@@ -57,7 +57,7 @@ public class CommandResult implements Result {
this.resultData = resultData;
this.gfJsonObject = this.resultData.getGfJsonObject();
this.status = this.resultData.getStatus();
- this.resultLines = new Vector<String>();
+ this.resultLines = new Vector<>();
}
@Override
@@ -78,7 +78,6 @@ public class CommandResult implements Result {
index = 0;
}
- // TODO -Abhishek - extract this code out in a FormatBuilder or PresentationBuilder??
private void buildData() {
try {
if (ResultData.TYPE_OBJECT.equals(resultData.getType())) {
@@ -95,7 +94,6 @@ public class CommandResult implements Result {
RowGroup rowGroup = resultTable.newRowGroup();
if (ResultData.TYPE_TABULAR.equals(resultData.getType())) {
- // resultTable.setColumnSeparator(" | ");
resultTable.setColumnSeparator(" ");
resultTable.setTabularResult(true);
buildTable(rowGroup, content);
@@ -111,7 +109,6 @@ public class CommandResult implements Result {
} catch (GfJsonException e) {
resultLines
.add("Error occurred while processing Command Result. Internal Error - Invalid Result.");
- // TODO - Abhishek. Add stack trace when 'debug' is enabled. Log to LogWrapper always
} finally {
isDataBuilt = true;
}
@@ -152,7 +149,7 @@ public class CommandResult implements Result {
}
}
- /* private */ void buildObjectResultOutput() {
+ void buildObjectResultOutput() {
try {
Table resultTable = TableBuilder.newTable();
resultTable.setColumnSeparator(" : ");
@@ -169,12 +166,7 @@ public class CommandResult implements Result {
GfJsonObject object = objectsArray.getJSONObject(i);
buildObjectSection(resultTable, null, object, 0);
}
- } /*
- * else { // GfJsonObject jsonObject =
- * content.getJSONObject(ObjectResultData.ROOT_OBJECT_ACCESSOR); //
- * buildObjectSection(resultTable, null, jsonObject, 0); }
- */
-
+ }
addFooterInTable(resultTable, getGfJsonObject());
resultLines.addAll(resultTable.buildTableList());
@@ -182,7 +174,6 @@ public class CommandResult implements Result {
} catch (GfJsonException e) {
resultLines
.add("Error occurred while processing Command Result. Internal Error - Invalid Result.");
- // TODO - Abhishek. Add stack trace when 'debug' is enabled. Log to LogWrapper always
} finally {
isDataBuilt = true;
}
@@ -191,7 +182,7 @@ public class CommandResult implements Result {
private void buildObjectSection(Table table, RowGroup parentRowGroup, GfJsonObject object,
int depth) throws GfJsonException {
Iterator<String> keys = object.keys();
- RowGroup rowGroup = null;
+ RowGroup rowGroup;
if (parentRowGroup != null) {
rowGroup = parentRowGroup;
} else {
@@ -205,8 +196,8 @@ public class CommandResult implements Result {
List<String> fieldsToSkipOnUI = null;
if (object.has(CliJsonSerializable.FIELDS_TO_SKIP_ON_UI)) {
- GfJsonArray jsonArray = object.getJSONArray(CliJsonSerializable.FIELDS_TO_SKIP_ON_UI);;
- fieldsToSkipOnUI = new ArrayList<String>();
+ GfJsonArray jsonArray = object.getJSONArray(CliJsonSerializable.FIELDS_TO_SKIP_ON_UI);
+ fieldsToSkipOnUI = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
fieldsToSkipOnUI.add(String.valueOf(jsonArray.get(i)));
}
@@ -222,8 +213,8 @@ public class CommandResult implements Result {
try {
nestedCollection = object.getJSONArray(key);
- } catch (GfJsonException e) {
- /* next check if it's a nested object */}
+ } catch (GfJsonException ignored) {
+ }
Object field = null;
if (nestedCollection == null) {
@@ -240,10 +231,8 @@ public class CommandResult implements Result {
Row newRow = rowGroup.newRow();
String prefix = "";
- /* if (nestedCollection != null) */ {
- for (int i = 0; i < depth; i++) {
- prefix += " . ";
- }
+ for (int i = 0; i < depth; i++) {
+ prefix += " . ";
}
String fieldNameToDisplay = fieldDisplayNames.getString(key);
@@ -252,22 +241,21 @@ public class CommandResult implements Result {
}
if (nestedCollection != null) {
- Map<String, Integer> columnsMap = new HashMap<String, Integer>();
+ Map<String, Integer> columnsMap = new HashMap<>();
- GfJsonArray rowsArray = nestedCollection;
RowGroup newRowGroup = table.newRowGroup();
newRowGroup.setColumnSeparator(" | ");
newRowGroup.newBlankRow();
newRowGroup.newRow().newLeftCol(fieldNameToDisplay);
Row headerRow = newRowGroup.newRow();
- int numOfRows = rowsArray.size();
+ int numOfRows = nestedCollection.size();
List<String> tableFieldsToSkipOnUI = null;
for (int j = 0; j < numOfRows; j++) {
- GfJsonObject content = rowsArray.getJSONObject(j);
+ GfJsonObject content = nestedCollection.getJSONObject(j);
if (content.has(CliJsonSerializable.FIELDS_TO_SKIP_ON_UI)) {
GfJsonArray jsonArray = content.getJSONArray(CliJsonSerializable.FIELDS_TO_SKIP_ON_UI);
- tableFieldsToSkipOnUI = new ArrayList<String>();
+ tableFieldsToSkipOnUI = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
tableFieldsToSkipOnUI.add(String.valueOf(jsonArray.get(i)));
}
@@ -284,7 +272,7 @@ public class CommandResult implements Result {
if (CliJsonSerializable.FIELDS_TO_SKIP.contains((String) columnName)
|| (tableFieldsToSkipOnUI != null
&& tableFieldsToSkipOnUI.contains(columnName))) {
- // skip file data if any //TODO - make response format better
+ // skip file data if any
continue;
}
@@ -299,7 +287,7 @@ public class CommandResult implements Result {
Object columnName = columnNames.get(i);
if (CliJsonSerializable.FIELDS_TO_SKIP.contains((String) columnName)
|| (tableFieldsToSkipOnUI != null && tableFieldsToSkipOnUI.contains(columnName))) {
- // skip file data if any //TODO - make response format better
+ // skip file data if any
continue;
}
newRow.newLeftCol(String.valueOf(content.get((String) columnName)));
@@ -308,18 +296,7 @@ public class CommandResult implements Result {
} else if (nestedObject != null) {
buildObjectSection(table, rowGroup, nestedObject, depth + 1);
} else {
- // Row newRow = rowGroup.newRow();
- // String prefix = "";
- // for (int i = 0; i < depth; i++) {
- // prefix += " . ";
- // }
- // newRow.newLeftCol(prefix+fieldDisplayNames.getString(key)).newLeftCol(field);
- Object value = field;
- /*
- * if (isPrimitiveOrStringOrWrapperArray(value)) { value = Arrays.toString((String[])value);
- * }
- */
- newRow.newLeftCol(value);
+ newRow.newLeftCol(field);
}
nestedCollection = null;
nestedObject = null;
@@ -375,14 +352,14 @@ public class CommandResult implements Result {
GfJsonArray jsonArr = (GfJsonArray) object;
try {
isPrimitive = isPrimitiveOrStringOrWrapper(jsonArr.get(0));
- } catch (GfJsonException e) {
+ } catch (GfJsonException ignored) {
}
}
return isPrimitive;
}
- /* private */ void buildComposite() {
+ void buildComposite() {
try {
GfJsonObject content = getContent();
if (content != null) {
@@ -418,7 +395,7 @@ public class CommandResult implements Result {
private void buildSection(Table table, RowGroup parentRowGroup, GfJsonObject section, int depth)
throws GfJsonException {
Iterator<String> keys = section.keys();
- RowGroup rowGroup = null;
+ RowGroup rowGroup;
if (parentRowGroup != null) {
rowGroup = parentRowGroup;
} else {
@@ -428,7 +405,6 @@ public class CommandResult implements Result {
while (keys.hasNext()) {
String key = keys.next();
Object object = section.get(key);
- // System.out.println(key +" : " + object);
if (key.startsWith(CompositeResultData.TABLE_DATA_ACCESSOR)) {
GfJsonObject tableObject = section.getJSONObject(key);
@@ -446,7 +422,6 @@ public class CommandResult implements Result {
rowGroup.newRowSeparator(separatorString.charAt(0), true);
} else if (key.equals(ResultData.RESULT_HEADER) || key.equals(ResultData.RESULT_FOOTER)) {
// skip header & footer
- continue;
} else {
Row newRow = rowGroup.newRow();
String prefix = "";
@@ -468,22 +443,14 @@ public class CommandResult implements Result {
newRow.newLeftCol(prefix + key).newLeftCol("");
}
}
- // System.out.println(key+" : "+object);
}
}
addFooterInRowGroup(rowGroup, section);
}
- // public static void main(String[] args) {
- // String[] valuesSeparatedByLines = getValuesSeparatedByLines(CliConstants.LINE_SEPARATOR);
- // System.out.println(valuesSeparatedByLines +" -- "+valuesSeparatedByLines.length);
- // }
-
private static String[] getValuesSeparatedByLines(Object object) {
- String[] values = null;
String valueString = String.valueOf(object);
- values = valueString.split(GfshParser.LINE_SEPARATOR);
- return values;
+ return valueString.split(GfshParser.LINE_SEPARATOR);
}
/**
@@ -502,10 +469,10 @@ public class CommandResult implements Result {
for (int i = 0; i < numOfColumns; i++) {
Object object = columnNames.get(i);
if (AbstractResultData.BYTE_DATA_ACCESSOR.equals(object)) {
- // skip file data if any //TODO - make response format better
+ // skip file data if any
continue;
}
- headerRow.newCenterCol((String) object);
+ headerRow.newCenterCol(object);
}
// Build remaining rows by extracting data column-wise from JSON object
@@ -513,7 +480,7 @@ public class CommandResult implements Result {
for (int i = 0; i < numOfColumns; i++) {
Object object = columnNames.get(i);
if (AbstractResultData.BYTE_DATA_ACCESSOR.equals(object)) {
- // skip file data if any //TODO - make response format better
+ // skip file data if any
continue;
}
GfJsonArray accumulatedData = content.getJSONArray((String) object);
@@ -574,13 +541,10 @@ public class CommandResult implements Result {
GfJsonArray bytesArray = content.getJSONArray(CompositeResultData.BYTE_DATA_ACCESSOR);
AbstractResultData.readFileDataAndDump(bytesArray, directory);
} else {
- throw new RuntimeException("No associated files to save .. "); // TODO Abhishek - add i18n
- // string
+ throw new RuntimeException("No associated files to save .. ");
}
numTimesSaved = numTimesSaved + 1;
- } catch (DataFormatException e) {
- throw new RuntimeException(e);
- } catch (GfJsonException e) {
+ } catch (DataFormatException | GfJsonException e) {
throw new RuntimeException(e);
}
}
@@ -621,14 +585,10 @@ public class CommandResult implements Result {
return gfJsonObject.getString(ResultData.RESULT_HEADER);
}
- public GfJsonObject getContent() throws GfJsonException {
+ public GfJsonObject getContent() {
return gfJsonObject.getJSONObject(ResultData.RESULT_CONTENT);
}
- // public String getContentStr() {
- // return gfJsonObject.getString(ResultData.RESULT_CONTENT);
- // }
-
public String getFooter() {
return getFooter(gfJsonObject);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
index 7d0d23b..9d93d3a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CompositeResultData.java
@@ -30,11 +30,11 @@ public class CompositeResultData extends AbstractResultData {
private int subsectionCount;
- /* package */ CompositeResultData() {
+ CompositeResultData() {
super();
}
- /* package */ CompositeResultData(GfJsonObject gfJsonObject) {
+ CompositeResultData(GfJsonObject gfJsonObject) {
super(gfJsonObject);
}
@@ -131,13 +131,13 @@ public class CompositeResultData extends AbstractResultData {
*
* @since GemFire 7.0
*/
- public static class SectionResultData /* extends AbstractResultData */ {
+ public static class SectionResultData {
protected GfJsonObject sectionGfJsonObject;
private int subsectionCount = 0;
private int tablesCount = 0;
- /* package */ SectionResultData() {
+ SectionResultData() {
sectionGfJsonObject = new GfJsonObject();
}
@@ -295,7 +295,7 @@ public class CompositeResultData extends AbstractResultData {
}
public String[] retrieveStringArray(String name) {
- String[] stringArray = null;
+ String[] stringArray;
Object retrievedObject = sectionGfJsonObject.get(name);
if (retrievedObject instanceof GfJsonArray) {
@@ -317,11 +317,6 @@ public class CompositeResultData extends AbstractResultData {
public static String generateTableKey(String keyToRetrieve) {
return TABLE_DATA_ACCESSOR + "-" + keyToRetrieve;
}
-
- // @Override
- // public String getType() {
- // return TYPE_SECTION;
- // }
}
public static void main(String[] args) {
@@ -362,10 +357,8 @@ public class CompositeResultData extends AbstractResultData {
.accumulate("NumOfBuckets", 100);
try {
- System.out.println(crd.getGfJsonObject().toIndentedString(/* 2 */0));
+ System.out.println(crd.getGfJsonObject().toIndentedString(0));
- } catch (GfJsonException e) {
- e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
index 94dbca0..2518793 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.management.internal.cli.result;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import java.util.Collection;
-import java.util.List;
-
/**
* Provides methods for creating {@link Result} objects to return from Gfsh command functions
*/
public class ResultBuilder {
public static final int CODE_SHELLCLIENT_ABORT_OP = 110;
- // public static final int OKCODE = 200;
// error on gfsh
public static final int ERRORCODE_DEFAULT = 400;
@@ -169,10 +168,6 @@ public class ResultBuilder {
return new ObjectResultData<>();
}
- // public static CatalogedResultData createCatalogedResultData() {
- // return new CatalogedResultData();
- // }
-
/**
* Creates a {@link InfoResultData} object to start building result that is required to be shown
* as an information without any specific format.
@@ -233,10 +228,7 @@ public class ResultBuilder {
AbstractResultData resultData;
if (ResultData.TYPE_TABULAR.equals(contentType)) {
resultData = new TabularResultData(data);
- } /*
- * else if (ResultData.TYPE_CATALOGED.equals(contentType)) { resultData = new
- * CatalogedResultData(new GfJsonObject(String.valueOf(content))); }
- */ else if (ResultData.TYPE_INFO.equals(contentType)) {
+ } else if (ResultData.TYPE_INFO.equals(contentType)) {
resultData = new InfoResultData(data);
} else if (ResultData.TYPE_ERROR.equals(contentType)) {
resultData = new ErrorResultData(data);
@@ -266,7 +258,6 @@ public class ResultBuilder {
while (result.hasNextLine()) {
builder.append(result.nextLine());
}
- // TODO - what to do with incoming files??
}
return builder.toString();
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
index 37a1d60..cacbef8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultData.java
@@ -28,12 +28,10 @@ public interface ResultData {
String RESULT_FOOTER = "footer";
- // String TYPE_CATALOGED = "catalog";
String TYPE_COMPOSITE = "composite";
String TYPE_ERROR = "error";
String TYPE_INFO = "info";
String TYPE_OBJECT = "object";
- // String TYPE_SECTION = "composite-section";
String TYPE_TABULAR = "table";
String getHeader();
@@ -44,7 +42,7 @@ public interface ResultData {
String getType();
- public Status getStatus();
+ Status getStatus();
- public void setStatus(final Status status);
+ void setStatus(final Status status);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
index ff23512..55081ed 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
@@ -53,12 +53,14 @@ package org.apache.geode.management.internal.cli.result;
*
* @since GemFire 7.0
*/
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.management.internal.cli.GfshParser;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.geode.management.internal.cli.GfshParser;
+
public class TableBuilder {
public static Table newTable() {
@@ -351,7 +353,6 @@ public class TableBuilder {
int maxNumCols = this.rowGroup.getNumCols();
for (int i = 0; i < maxNumCols; i++) {
- // int maxColLength = this.rowGroup.getMaxColLength(i);
int maxColLength = this.rowGroup.getColSize(i);
for (int j = 0; j < maxColLength; j++) {
stringBuffer.append(this.rowSeparator);
@@ -382,7 +383,7 @@ public class TableBuilder {
}
}
- private static enum Align {
+ private enum Align {
LEFT, RIGHT, CENTER
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java
index 503c252..2d55f42 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java
@@ -56,6 +56,7 @@ import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.CommandManager;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.LogWrapper;
+import org.apache.geode.management.internal.cli.converters.RegionPathConverter;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
@@ -80,7 +81,7 @@ import org.apache.geode.management.internal.cli.util.CommentSkipHelper;
* </ul>
* <p />
* Additionally, this class is used to maintain GemFire SHell (gfsh) specific information like:
- * environment TODO
+ * environment
*
*
* @since GemFire 7.0
@@ -121,7 +122,6 @@ public class Gfsh extends JLineShell {
public static final String ENV_SYS_OS_LINE_SEPARATOR = "SYS_OS_LINE_SEPARATOR";
public static final String ENV_SYS_GEODE_HOME_DIR = "SYS_GEODE_HOME_DIR";
- // TODO merge find a better place for these
// SSL Configuration properties. keystore/truststore type is not include
public static final String SSL_KEYSTORE = "javax.net.ssl.keyStore";
public static final String SSL_KEYSTORE_PASSWORD = "javax.net.ssl.keyStorePassword";
@@ -133,19 +133,18 @@ public class Gfsh extends JLineShell {
private static final int DEFAULT_HEIGHT = 100;
private static final Object INSTANCE_LOCK = new Object();
- // private static final String ANIMATION_SLOT = "A"; //see 46072
protected static PrintStream gfshout = System.out;
protected static PrintStream gfsherr = System.err;
- protected static ThreadLocal<Gfsh> gfshThreadLocal = new ThreadLocal<Gfsh>();
+ protected static ThreadLocal<Gfsh> gfshThreadLocal = new ThreadLocal<>();
private static Gfsh instance;
// This flag is used to restrict column trimming to table only types
- private static ThreadLocal<Boolean> resultTypeTL = new ThreadLocal<Boolean>();
+ private static ThreadLocal<Boolean> resultTypeTL = new ThreadLocal<>();
private static String OS = System.getProperty("os.name").toLowerCase();
- private final Map<String, String> env = new TreeMap<String, String>();
- private final List<String> readonlyAppEnv = new ArrayList<String>();
+ private final Map<String, String> env = new TreeMap<>();
+ private final List<String> readonlyAppEnv = new ArrayList<>();
// Map to keep reference to actual user specified Command String
// Should always have one value at the max
- private final Map<String, String> expandedPropCommandsMap = new HashMap<String, String>();
+ private final Map<String, String> expandedPropCommandsMap = new HashMap<>();
private final ExecutionStrategy executionStrategy;
private final GfshParser parser;
private final LogWrapper gfshFileLogger;
@@ -158,11 +157,11 @@ public class Gfsh extends JLineShell {
private Thread runner;
private boolean debugON;
private Terminal terminal;
- private boolean supressScriptCmdOutput;
+ private boolean suppressScriptCmdOutput;
private boolean isScriptRunning;
private AbstractSignalNotificationHandler signalHandler;
- protected Gfsh() throws ClassNotFoundException, IOException {
+ protected Gfsh() {
this(null);
}
@@ -173,7 +172,7 @@ public class Gfsh extends JLineShell {
* @throws IOException
* @throws ClassNotFoundException
*/
- protected Gfsh(String[] args) throws ClassNotFoundException, IOException {
+ protected Gfsh(String[] args) {
this(true, args, new GfshConfig());
}
@@ -186,8 +185,7 @@ public class Gfsh extends JLineShell {
* @throws IOException
* @throws ClassNotFoundException
*/
- protected Gfsh(boolean launchShell, String[] args, GfshConfig gfshConfig)
- throws ClassNotFoundException, IOException {
+ protected Gfsh(boolean launchShell, String[] args, GfshConfig gfshConfig) {
// 1. Disable suppressing of duplicate messages
JLineLogHandler.setSuppressDuplicateMessages(false);
@@ -195,11 +193,7 @@ public class Gfsh extends JLineShell {
this.gfshConfig = gfshConfig;
this.gfshFileLogger = LogWrapper.getInstance();
this.gfshFileLogger.configure(this.gfshConfig);
- this.ansiHandler = ANSIHandler.getInstance(this.gfshConfig.isANSISupported()); // TODO -
- // Abhishek :
- // should take it
- // from
- // ConsoleReader.terminal??
+ this.ansiHandler = ANSIHandler.getInstance(this.gfshConfig.isANSISupported());
/* 3. log system properties & gfsh environment */
this.gfshFileLogger.info(Banner.getString(args));
@@ -255,8 +249,7 @@ public class Gfsh extends JLineShell {
}
}
- public static Gfsh getInstance(boolean launchShell, String[] args, GfshConfig gfshConfig)
- throws ClassNotFoundException, IOException {
+ public static Gfsh getInstance(boolean launchShell, String[] args, GfshConfig gfshConfig) {
if (instance == null) {
synchronized (INSTANCE_LOCK) {
if (instance == null) {
@@ -295,7 +288,7 @@ public class Gfsh extends JLineShell {
// See 46369
private static String readLine(ConsoleReader reader, String prompt) throws IOException {
String earlierLine = reader.getCursorBuffer().toString();
- String readLine = null;
+ String readLine;
try {
readLine = reader.readLine(prompt);
} catch (IndexOutOfBoundsException e) {
@@ -327,7 +320,6 @@ public class Gfsh extends JLineShell {
while (loggerNames.hasMoreElements()) {
String loggerName = loggerNames.nextElement();
if (loggerName.startsWith("java.") || loggerName.startsWith("javax.")) {
- // System.out.println(loggerName);
Logger javaLogger = logManager.getLogger(loggerName);
/*
* From Java Docs: It is also important to note that the Logger associated with the String
@@ -423,7 +415,7 @@ public class Gfsh extends JLineShell {
} else {
final int spaceCharIndex = string.lastIndexOf(" ", index);
- // If no spaces were found then there's no logical wayto split the string
+ // If no spaces were found then there's no logical way to split the string
if (spaceCharIndex == -1) {
stringBuf.append(string.substring(startOfCurrentLine, index)).append(LINE_SEPARATOR);
@@ -453,7 +445,7 @@ public class Gfsh extends JLineShell {
env.put(ENV_SYS_OS_LINE_SEPARATOR, System.getProperty("line.separator"));
env.put(ENV_SYS_GEODE_HOME_DIR, System.getenv("GEODE_HOME"));
- env.put(ENV_APP_NAME, org.apache.geode.management.internal.cli.shell.Gfsh.GFSH_APP_NAME);
+ env.put(ENV_APP_NAME, Gfsh.GFSH_APP_NAME);
readonlyAppEnv.add(ENV_APP_NAME);
env.put(ENV_APP_LOGGING_ENABLED,
String.valueOf(!Level.OFF.equals(this.gfshConfig.getLogLevel())));
@@ -506,7 +498,6 @@ public class Gfsh extends JLineShell {
* Stops this GemFire Shell.
*/
public void stop() {
- // flashMessage("\b"); // see 46072
closeShell();
LogWrapper.close();
if (operationInvoker != null && operationInvoker.isConnected()) {
@@ -544,7 +535,6 @@ public class Gfsh extends JLineShell {
* See findResources in {@link AbstractShell}
*/
protected Collection<URL> findResources(String resourceName) {
- // return Collections.singleton(ClassPathLoader.getLatest().getResource(resourceName));
return null;
}
@@ -604,8 +594,6 @@ public class Gfsh extends JLineShell {
}
success = super.executeScriptLine(withPropsExpanded);
} catch (Exception e) {
- // TODO: should there be a way to differentiate error in shell & error on
- // server. May be by exception type.
setLastExecutionStatus(-1);
} finally { // Add all commands to in-memory GfshHistory
gfshHistory.setAutoFlush(true);
@@ -700,7 +688,7 @@ public class Gfsh extends JLineShell {
while (commandResult.hasNextLine()) {
write(commandResult.nextLine(), isError);
}
- } else if (!supressScriptCmdOutput) {
+ } else if (!suppressScriptCmdOutput) {
// Command is part of script. Show output only when quite=false
while (commandResult.hasNextLine()) {
write(commandResult.nextLine(), isError);
@@ -742,7 +730,7 @@ public class Gfsh extends JLineShell {
}
private boolean isUnix() {
- return !(OS.indexOf("win") >= 0);
+ return !(OS.contains("win"));
}
private void write(String message, boolean isError) {
@@ -885,7 +873,7 @@ public class Gfsh extends JLineShell {
}
public Result executeScript(File scriptFile, boolean quiet, boolean continueOnError) {
- Result result = null;
+ Result result;
String initialIsQuiet = getEnvProperty(ENV_APP_QUIET_EXECUTION);
try {
this.isScriptRunning = true;
@@ -900,12 +888,11 @@ public class Gfsh extends JLineShell {
ScriptExecutionDetails scriptInfo = new ScriptExecutionDetails(scriptFile.getPath());
if (scriptFile.exists()) {
setEnvProperty(ENV_APP_QUIET_EXECUTION, String.valueOf(quiet));
- this.supressScriptCmdOutput = quiet;
+ this.suppressScriptCmdOutput = quiet;
BufferedReader reader = new BufferedReader(new FileReader(scriptFile));
String lineRead = "";
StringBuilder linesBuffer = new StringBuilder();
- String linesBufferString = ""; // used to check whether the string in a buffer contains a
- // ";".
+ String linesBufferString = "";
int commandSrNum = 0;
CommentSkipHelper commentSkipper = new CommentSkipHelper();
@@ -925,7 +912,6 @@ public class Gfsh extends JLineShell {
linesBufferString = linesBuffer.toString();
// NOTE: Similar code is in promptLoop()
if (!linesBufferString.endsWith(GfshParser.CONTINUATION_CHARACTER)) { // see 45893
- // String command = null;
List<String> commandList = MultiCommandHelper.getMultipleCommands(linesBufferString);
for (String cmdLet : commandList) {
@@ -995,18 +981,11 @@ public class Gfsh extends JLineShell {
}
public Map<String, String> getEnv() {
- Map<String, String> map = new TreeMap<String, String>();
+ Map<String, String> map = new TreeMap<>();
map.putAll(env);
return map;
}
- @Override
- public void setPromptPath(String currentContext) {
- super.setPromptPath(currentContext);
- // Enable when "use region" command is required. See #46110
- // env.put(CliConstants.ENV_APP_CONTEXT_PATH, currentContext);
- }
-
public boolean isQuietMode() {
return Boolean.parseBoolean(env.get(ENV_APP_QUIET_EXECUTION));
}
@@ -1100,7 +1079,7 @@ public class Gfsh extends JLineShell {
@Override
protected String getPromptText() {
String defaultPrompt = gfshConfig.getDefaultPrompt();
- String contextPath = /* getEnvProperty(CliConstants.ENV_APP_CONTEXT_PATH) */ "";
+ String contextPath = "";
String clusterString = "";
if (getOperationInvoker() != null && isConnectedAndReady()) {
@@ -1108,14 +1087,6 @@ public class Gfsh extends JLineShell {
if (clusterId != OperationInvoker.CLUSTER_ID_WHEN_NOT_CONNECTED) {
clusterString = "Cluster-" + clusterId + " ";
}
- // //As "use region" is not in scope for 7.0, see 46110.
- // if (contextPath == null) {
- // contextPath = "." + CliConstants.DEFAULT_APP_CONTEXT_PATH;
- // } else {
- // contextPath = "." + contextPath;
- // }
- // } else {
- // contextPath = "." + CliConstants.DEFAULT_APP_CONTEXT_PATH;
}
defaultPrompt = MessageFormat.format(defaultPrompt, clusterString, contextPath);
@@ -1130,8 +1101,7 @@ public class Gfsh extends JLineShell {
if (gfshFileLogger.severeEnabled()) {
gfshFileLogger.severe(message);
}
- setPromptPath(
- org.apache.geode.management.internal.cli.converters.RegionPathConverter.DEFAULT_APP_CONTEXT_PATH);
+ setPromptPath(RegionPathConverter.DEFAULT_APP_CONTEXT_PATH);
}
public boolean getDebug() {
@@ -1153,7 +1123,7 @@ public class Gfsh extends JLineShell {
private String expandProperties(final String input) {
String output = input;
Scanner s = new Scanner(output);
- String foundInLine = null;
+ String foundInLine;
while ((foundInLine = s.findInLine("(\\$[\\{]\\w+[\\}])")) != null) {
String envProperty = getEnvProperty(extractKey(foundInLine));
envProperty = envProperty != null ? envProperty : "";
@@ -1170,7 +1140,7 @@ class ScriptExecutionDetails {
ScriptExecutionDetails(String filePath) {
this.filePath = filePath;
- this.commandAndStatusList = new ArrayList<CommandAndStatus>();
+ this.commandAndStatusList = new ArrayList<>();
}
void addCommandAndStatus(String command, String status) {
@@ -1190,7 +1160,7 @@ class ScriptExecutionDetails {
section.addData("Command-" + String.valueOf(commandSrNo), commandAndStatus.command);
section.addData("Status", commandAndStatus.status);
if (commandAndStatus.status.equals("FAILED")) {
- compositeResultData.setStatus(org.apache.geode.management.cli.Result.Status.ERROR);
+ compositeResultData.setStatus(Result.Status.ERROR);
}
if (i != this.commandAndStatusList.size()) {
section.setFooter(Gfsh.LINE_SEPARATOR);
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
index 6794b3b..735143f 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
@@ -131,14 +131,6 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
return cliMetadata != null ? cliMetadata.interceptor() : CliMetaData.ANNOTATION_NULL_VALUE;
}
- // Not used currently
- // private static String getCommandName(ParseResult result) {
- // Method method = result.getMethod();
- // CliCommand cliCommand = method.getAnnotation(CliCommand.class);
- //
- // return cliCommand != null ? cliCommand.value() [0] : null;
- // }
-
/**
* Indicates commands are able to be presented. This generally means all important system startup
* activities have completed. Copied from {@link ExecutionStrategy#isReadyForCommands()}.
@@ -157,7 +149,6 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
*/
@Override
public void terminate() {
- // TODO: Is additional cleanup required?
shell = null;
}
//////////////// ExecutionStrategy interface Methods End /////////////////////
@@ -247,8 +238,6 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
String debugInfo = commandResponse.getDebugInfo();
if (StringUtils.isNotBlank(debugInfo)) {
- // TODO - Abhishek When debug is ON, log response in gfsh logs
- // TODO - Abhishek handle \n better. Is it coming from GemFire formatter
debugInfo = debugInfo.replaceAll("\n\n\n", "\n");
debugInfo = debugInfo.replaceAll("\n\n", "\n");
debugInfo =
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
index 5066496..d2407b3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
@@ -18,7 +18,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_P
import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PREFIX;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.HashMap;
@@ -88,21 +87,21 @@ public class JmxOperationInvoker implements OperationInvoker {
private ObjectName managerMemberObjectName;
- /* package */ final AtomicBoolean isConnected = new AtomicBoolean(false);
- /* package */ final AtomicBoolean isSelfDisconnect = new AtomicBoolean(false);
+ final AtomicBoolean isConnected = new AtomicBoolean(false);
+ final AtomicBoolean isSelfDisconnect = new AtomicBoolean(false);
private int clusterId = CLUSTER_ID_WHEN_NOT_CONNECTED;
public JmxOperationInvoker(final String host, final int port, Properties gfProperties)
throws Exception {
- final Set<String> propsToClear = new TreeSet<String>();
+ final Set<String> propsToClear = new TreeSet<>();
try {
this.managerHost = host;
this.managerPort = port;
this.endpoints = host + "[" + port + "]"; // Use the same syntax as the "connect" command.
// Modify check period from default (60 sec) to 1 sec
- final Map<String, Object> env = new HashMap<String, Object>();
+ final Map<String, Object> env = new HashMap<>();
env.put(JMXConnectionListener.CHECK_PERIOD_PROP, JMXConnectionListener.CHECK_PERIOD);
env.put(JMXConnector.CREDENTIALS, gfProperties);
@@ -169,12 +168,6 @@ public class JmxOperationInvoker implements OperationInvoker {
this.isConnected.set(true);
this.clusterId = distributedSystemMXBeanProxy.getDistributedSystemId();
- } catch (NullPointerException e) {
- throw e;
- } catch (MalformedURLException e) {
- throw e;
- } catch (IOException e) {
- throw e;
} finally {
for (String propToClear : propsToClear) {
System.clearProperty(propToClear);
@@ -215,7 +208,7 @@ public class JmxOperationInvoker implements OperationInvoker {
throw new JMXInvocationException(attributeName + " not found for " + resourceName, e);
} catch (InstanceNotFoundException e) {
throw new JMXInvocationException(resourceName + " is not registered in the MBean server.", e);
- } catch (MalformedObjectNameException e) {
+ } catch (MalformedObjectNameException | IOException e) {
throw new JMXInvocationException(resourceName + " is not a valid resource name.", e);
} catch (MBeanException e) {
throw new JMXInvocationException(
@@ -225,8 +218,6 @@ public class JmxOperationInvoker implements OperationInvoker {
e);
} catch (NullPointerException e) {
throw new JMXInvocationException("Given resourceName is null.", e);
- } catch (IOException e) {
- throw new JMXInvocationException(resourceName + " is not a valid resource name.", e);
}
}
@@ -283,8 +274,6 @@ public class JmxOperationInvoker implements OperationInvoker {
@Override
public Object processCommand(final CommandRequest commandRequest) throws JMXInvocationException {
- // Gfsh.getCurrentInstance().printAsSevere(String.format("Command (%1$s)%n",
- // commandRequest.getInput()));
if (commandRequest.hasFileData()) {
return memberMXBeanProxy.processCommand(commandRequest.getInput(),
commandRequest.getEnvironment(), ArrayUtils.toByteArray(commandRequest.getFileData()));
@@ -365,7 +354,7 @@ public class JmxOperationInvoker implements OperationInvoker {
return this.clusterId;
}
- /* package */ void resetClusterId() {
+ void resetClusterId() {
clusterId = CLUSTER_ID_WHEN_NOT_CONNECTED;
}
@@ -378,12 +367,10 @@ public class JmxOperationInvoker implements OperationInvoker {
*
* @return for an IPv6 address returns compatible host address otherwise returns the same string
*/
- // TODO - Abhishek: move to utility class
- // Taken from GFMon
public static String checkAndConvertToCompatibleIPv6Syntax(String hostAddress) {
// if host string contains ":", considering it as an IPv6 Address
// Conforming to RFC2732 - http://www.ietf.org/rfc/rfc2732.txt
- if (hostAddress.indexOf(":") != -1) {
+ if (hostAddress.contains(":")) {
LogWrapper logger = LogWrapper.getInstance();
if (logger.fineEnabled()) {
logger.fine("IPv6 host address detected, using IPv6 syntax for host in JMX connection URL");
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
index 5d9e31b..641c4d9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/unsafe/GfshSignalHandler.java
@@ -18,12 +18,12 @@ import java.util.Collections;
import java.util.Hashtable;
import java.util.Map;
+import sun.misc.SignalHandler;
+
import org.apache.geode.internal.process.signal.AbstractSignalNotificationHandler;
import org.apache.geode.internal.process.signal.Signal;
import org.apache.geode.internal.process.signal.SignalEvent;
-import sun.misc.SignalHandler;
-
/**
* This class externalizes signal handling in order to make the GemFire build process a bit cleaner
* - for example we have to have exceptions for sun.misc classes when building javadocs.
@@ -42,13 +42,6 @@ public class GfshSignalHandler extends AbstractSignalNotificationHandler impleme
public GfshSignalHandler() {
for (final Signal signal : Signal.values()) {
- // NOTE SignalHandler registration for SIGQUIT led to an IllegalArgumentException without the
- // following
- // "if" statement...
- // Exception in thread "main" java.lang.IllegalArgumentException: Signal already used by VM:
- // SIGQUIT
- // if (!Signal.SIGQUIT.equals(signal)) {
- // TODO uncomment above if statement if all Signals need to be handled by this SignalHandler
if (Signal.SIGINT.equals(signal)) {
originalSignalHandlers.put(signal,
sun.misc.Signal.handle(new sun.misc.Signal(signal.getName()), this));
@@ -58,8 +51,6 @@ public class GfshSignalHandler extends AbstractSignalNotificationHandler impleme
@Override
public void handle(final sun.misc.Signal sig) {
- // System.err.printf("Thread (%1$s) is processing Signal '%2$s' (%3$d)...%n",
- // Thread.currentThread().getName(), sig.getName(), sig.getNumber());
notifyListeners(new SignalEvent(sig, Signal.valueOfName(sig.getName())));
handleDefault(sig);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
index 8adac15..c9d05b0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.management.internal.cli.util;
-import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.internal.logging.LogWriterImpl;
-import org.apache.geode.internal.logging.log4j.LogLevel;
-import org.apache.geode.management.internal.cli.GfshParser;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
@@ -32,6 +26,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.internal.logging.LogWriterImpl;
+import org.apache.geode.internal.logging.log4j.LogLevel;
+import org.apache.geode.management.internal.cli.GfshParser;
+
/**
*
*
@@ -55,50 +54,38 @@ public class ReadWriteFile {
String onlyLogLevel, String startTime, String endTime) {
try {
long lineCount = 0;
- BufferedReader input = null;
- BufferedWriter output = null;
+ BufferedReader input;
+ BufferedWriter output;
File logFileNameFile = new File(logFileName);
- if (logFileNameFile.canRead() == false) {
+ if (!logFileNameFile.canRead()) {
return ("Cannot read logFileName=" + logFileName);
}
input = new BufferedReader(new FileReader(logFileName));
- String line = null;
+ String line;
File logToBeWrittenToFile = new File(logToBeWritten);
output = new BufferedWriter(new FileWriter(logToBeWrittenToFile));
if (!logToBeWrittenToFile.exists()) {
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
- return (logToBeWritten + " doesn not exist");
+ input.close();
+ output.flush();
+ output.close();
+ return (logToBeWritten + " does not exist");
}
if (!logToBeWrittenToFile.isFile()) {
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
+ input.close();
+ output.flush();
+ output.close();
return (logToBeWritten + " is not a file");
}
if (!logToBeWrittenToFile.canWrite()) {
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
+ input.close();
+ output.flush();
+ output.close();
return ("can not write file " + logToBeWritten);
}
// build possible log levels based on user input
// get all the levels below the one mentioned by user
- List<String> logLevels = new ArrayList<String>();
+ List<String> logLevels = new ArrayList<>();
if (onlyLogLevel.toLowerCase().equals("false")) {
int[] intLogLevels = LogWriterImpl.allLevels;
for (int level : intLogLevels) {
@@ -112,18 +99,13 @@ public class ReadWriteFile {
boolean timeRangeCheck = false;
boolean foundLogLevelTag = false;
boolean validateLogLevel = true;
- while (input.ready() == true && (line = input.readLine()) != null) {
- if (new File(logFileName).canRead() == false) {
+ while (input.ready() && (line = input.readLine()) != null) {
+ if (!new File(logFileName).canRead()) {
return ("Cannot read logFileName=" + logFileName);
}
- // boolean validateLogLevel = true;
lineCount++;
- if (line.startsWith("[")) {
- foundLogLevelTag = true;
- } else {
- foundLogLevelTag = false;
- }
- if (line.contains("[info ") && timeRangeCheck == false) {
+ foundLogLevelTag = line.startsWith("[");
+ if (line.contains("[info ") && !timeRangeCheck) {
String stTime = "";
int spaceCounter = 0;
for (int i = line.indexOf("[info ") + 6; i < line.length(); i++) {
@@ -152,12 +134,12 @@ public class ReadWriteFile {
// set this so that no need to check time range for each line
timeRangeCheck = true;
} else {
- // dont take this log file as this does not fit in time range
+ // don't take this log file as this does not fit in time range
break;
}
}
- if (foundLogLevelTag == true) {
+ if (foundLogLevelTag) {
validateLogLevel = checkLogLevel(line, logLevel, logLevels, foundLogLevelTag);
}
@@ -178,11 +160,9 @@ public class ReadWriteFile {
output.flush();
output.close();
}
- return ("Sucessfully written file " + logFileName);
+ return ("Successfully written file " + logFileName);
} catch (FunctionException ex) {
return ("readWriteFile FunctionException " + ex.getMessage());
- } catch (FileNotFoundException ex) {
- return ("readWriteFile FileNotFoundException " + ex.getMessage());
} catch (IOException ex) {
return ("readWriteFile FileNotFoundException " + ex.getMessage());
} catch (Exception ex) {
@@ -194,7 +174,7 @@ public class ReadWriteFile {
boolean foundLogLevelTag) {
if (line == null) {
return false;
- } else if (line != null && foundLogLevelTag == true) {
+ } else if (foundLogLevelTag) {
if (logLevel.toLowerCase().equals("all")) {
return true;
} else if (line.equals(GfshParser.LINE_SEPARATOR)) {
@@ -207,7 +187,7 @@ public class ReadWriteFile {
if (indexFrom > -1 && indexTo > -1 && indexTo > indexFrom) {
boolean flag =
line.substring(indexFrom + 1, indexTo).toLowerCase().contains(permittedLogLevel);
- if (flag == true) {
+ if (flag) {
return flag;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
index 7450757..97f48a5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.management.internal.configuration.domain;
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION;
import static org.apache.geode.management.internal.configuration.utils.XmlUtils.getAttribute;
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
import java.io.IOException;
import java.net.URL;
@@ -111,8 +111,7 @@ public class CacheElement {
XmlUtils.buildSchemaLocationMap(getAttribute(doc.getFirstChild(),
W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION, W3C_XML_SCHEMA_INSTANCE_NS_URI));
- final LinkedHashMap<String, CacheElement> elementMap =
- new LinkedHashMap<String, CacheElement>();
+ final LinkedHashMap<String, CacheElement> elementMap = new LinkedHashMap<>();
buildElementMapCacheType(elementMap,
resolveSchema(schemaLocationMap, CacheXml.GEODE_NAMESPACE));
@@ -210,10 +209,6 @@ public class CacheElement {
final String name = getAttribute(child, "name");
elementMap.put(name, new CacheElement(name, rank++, isMultiple(child)));
break;
- // TODO group support as XSD matures
- // case "xsd:group":
- // buildElementMapGroup(elementMap, doc, child, rank, xPathContext);
- // break;
case "xsd:choice":
case "xsd:sequence":
rank = buildElementMapXPath(elementMap, schema, child, rank,
@@ -223,7 +218,6 @@ public class CacheElement {
// ignore extensions
break;
default:
- // TODO jbarrett - localize
throw new UnsupportedOperationException(
"Unsupported child type '" + child.getNodeName() + "'");
}
@@ -236,16 +230,12 @@ public class CacheElement {
* Tests if element allows multiple.
*
* @param element to test for multiple.
- * @return true if mulitple allowed, otherwise false.
+ * @return true if multiple allowed, otherwise false.
* @since GemFire 8.1
*/
private static boolean isMultiple(final Element element) {
- final String maxOccurs = getAttribute(element, "maxOccurs");
- if (null != maxOccurs && !maxOccurs.equals("1")) {
- // is "unbounded" or greater than 1 if valid schema.
- return true;
- }
- return false;
+ String maxOccurs = getAttribute(element, "maxOccurs");
+ return null != maxOccurs && !maxOccurs.equals("1");
}
}