This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5013
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5013 by this
push:
new 63df5c0 remove debug statements, fix up pom xml files
63df5c0 is described below
commit 63df5c0b22610cc86e9eb25640a0cd1053889e1b
Author: Bruce Schuchardt <[email protected]>
AuthorDate: Wed Mar 13 09:50:24 2019 -0700
remove debug statements, fix up pom xml files
---
.../geode/codeAnalysis/sanctionedDataSerializables.txt | 2 +-
.../java/org/apache/geode/distributed/LocatorLauncher.java | 8 --------
.../management/internal/cli/CommandResponseBuilder.java | 2 --
.../geode/management/internal/cli/json/GfJsonArray.java | 7 ++++++-
.../geode/management/internal/cli/json/GfJsonObject.java | 14 ++++++++------
.../internal/cli/result/LegacyCommandResult.java | 2 --
.../management/internal/cli/result/ModelCommandResult.java | 1 -
.../apache/geode/management/internal/cli/shell/Gfsh.java | 11 +----------
geode-core/src/test/resources/expected-pom.xml | 5 -----
.../apache/geode/management/internal/cli/HeadlessGfsh.java | 8 --------
.../org/apache/geode/test/junit/rules/GfshCommandRule.java | 2 --
geode-dunit/src/test/resources/expected-pom.xml | 5 -----
geode-web-api/src/test/resources/expected-pom.xml | 5 +++++
13 files changed, 21 insertions(+), 51 deletions(-)
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index df4c310..61993e4 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1981,7 +1981,7 @@ fromData,212
toData,239
org/apache/geode/internal/cache/versions/VersionTag,2
-fromData,187
+fromData,189
toData,259
org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index d9a845c..cb7a7d9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -1999,14 +1999,6 @@ public class LocatorLauncher extends
AbstractLauncher<String> {
final Status status =
Status.valueOfDescription(gfJsonObject.getString(JSON_STATUS));
- // StringWriter writer = new StringWriter().append("Bruce:
LocatorState.fromJson document
- // keys=");
- // for (Iterator<String> keys = gfJsonObject.keys(); keys.hasNext();) {
- // writer.append(" ").append(keys.next());
- // }
- // System.out.println(writer.toString());
- // System.out.println("Bruce:
jvmArguments="+gfJsonObject.getJSONObject(JSON_JVMARGUMENTS));
-
final List<String> jvmArguments =
gfJsonObject.getJSONArray(JSON_JVMARGUMENTS).toStringList();
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 85ba64e..1d3956b 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
@@ -34,8 +34,6 @@ public class CommandResponseBuilder {
private static CommandResponse prepareCommandResponse(String memberName,
CommandResult result) {
GfJsonObject content;
content = result.getContent();
- // System.out.println("Bruce:
- // CommandResponseBuilder.prepareCommandResponse(content="+content+")");
return new CommandResponse(memberName, getType(result),
result.getStatus().getCode(), "1/1",
CliMetaData.ANNOTATION_NULL_VALUE, getDebugInfo(), result.getHeader(),
content,
result.getFooter(), result.failedToPersist(),
result.getFileToDownload());
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
index 5a65a21..a5fde33 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
@@ -67,7 +67,12 @@ public class GfJsonArray extends AbstractJSONFormatter {
*/
public String getString(int index) throws GfJsonException {
try {
- return jsonArray.get(index).asText();
+ JsonNode node = jsonArray.get(index);
+ if (node.textValue() != null) {
+ return node.asText();
+ } else {
+ return node.toString();
+ }
} catch (IllegalArgumentException e) {
throw new GfJsonException(e);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
index eb0418a..e581161 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
@@ -85,6 +85,9 @@ public class GfJsonObject extends AbstractJSONFormatter {
} catch (IOException e) {
throw new GfJsonException(e.getMessage());
}
+ if (rootNode == null) {
+ throw new GfJsonException("Unable to parse JSON document");
+ }
}
void postCreateMapper() {
@@ -146,13 +149,14 @@ public class GfJsonObject extends AbstractJSONFormatter {
}
public String getString(String key) {
- // System.out.println("Bruce: rootNode.getString(" + key + ") =" +
rootNode.get(key)/* + "
- // (rootNode="+rootNode+")"*/);
JsonNode node = rootNode.get(key);
if (node == null) {
return null; // "null";
}
- return node.asText();
+ if (node.textValue() != null) {
+ return node.textValue();
+ }
+ return node.toString();
}
public int getInt(String key) {
@@ -337,8 +341,6 @@ public class GfJsonObject extends AbstractJSONFormatter {
public List<String> getArrayValues(String key) {
List<String> result = new ArrayList<>();
- // System.out.println("Bruce: GfJsonObject.getArrayValues("+key+")
node="+rootNode.get(key) + "
- // class="+rootNode.get(key).getClass());
if (rootNode.has(key)) {
JsonNode node = rootNode.get(key);
if (!(node instanceof ArrayNode)) {
@@ -347,7 +349,7 @@ public class GfJsonObject extends AbstractJSONFormatter {
ArrayNode array = (ArrayNode) node;
for (int i = 0; i < array.size(); i++) {
JsonNode valueNode = array.get(i);
- result.add(valueNode.asText());
+ result.add(valueNode.textValue() == null ? valueNode.toString() :
valueNode.asText());
}
}
return result;
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/LegacyCommandResult.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/LegacyCommandResult.java
index 4fcea83..9c9b29e 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/LegacyCommandResult.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/LegacyCommandResult.java
@@ -402,7 +402,6 @@ public class LegacyCommandResult implements CommandResult {
public String getMessageFromContent() {
List<String> messages;
try {
- // System.out.println("BRUCE: getMessageFromContent()
content="+getContent());
GfJsonArray jsonArray = getContent().getJSONArray("message");
if (jsonArray == null) {
return "";
@@ -422,7 +421,6 @@ public class LegacyCommandResult implements CommandResult {
@Override
public List<String> getListFromContent(String key) {
- // System.out.println("Bruce:
LegacyCommandResult.getListFromContentString("+key+")");
return getContent().getArrayValues(key);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java
index 3031c2b..3143d61 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java
@@ -167,7 +167,6 @@ public class ModelCommandResult implements CommandResult {
@Override
public List<String> getListFromContent(String key) {
- // System.out.println("BRUCE:
ModelCommandResult.getListFromContentString("+key+")");
return null;
}
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 20499df..ad56fca 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
@@ -269,22 +269,17 @@ public class Gfsh extends JLineShell {
return resultTypeTL.get();
}
- public static void println() {
- // System.out.println("Bruce: println()"); gfshout.println();
- }
+ public static void println() {}
public static <T> void println(T toPrint) {
- // System.out.println("Bruce: println(" + "\"" + toPrint + "\")");
gfshout.println(toPrint);
}
public static <T> void print(T toPrint) {
- // System.out.print("Bruce: print(\"" + toPrint + "\")");
gfshout.print(toPrint);
}
public static <T> void printlnErr(T toPrint) {
- // System.err.println("Bruce: printlnErr(\""+toPrint+"\"");
gfsherr.println(toPrint);
}
@@ -710,7 +705,6 @@ public class Gfsh extends JLineShell {
// Normal Command
while (commandResult.hasNextLine()) {
String nextLine = commandResult.nextLine();
- // System.out.println("Bruce: Gfsh.handleExecutionResult writing
" + nextLine);
write(nextLine, isError);
}
} else if (!suppressScriptCmdOutput) {
@@ -727,7 +721,6 @@ public class Gfsh extends JLineShell {
// to save the exported file at this point. All file saving should be
done in the
// specific command's postExecutor
if (result instanceof LegacyCommandResult) {
- // System.out.println("Bruce: Gfsh.handleExecutionResult processing
LegacyCommandResult");
CommandResult cmdResult = (CommandResult) result;
if (cmdResult.hasIncomingFiles()) {
boolean isAlreadySaved = cmdResult.getNumTimesSaved() > 0;
@@ -739,11 +732,9 @@ public class Gfsh extends JLineShell {
}
}
if (result != null && !(result instanceof Result)) {
- // System.out.println("Bruce: Gfsh.handleExecutionResult is printing
"+result);
printAsInfo(result.toString());
}
} catch (Exception e) {
- e.printStackTrace();
printAsWarning(e.getMessage());
logToFile(e.getMessage(), e);
}
diff --git a/geode-core/src/test/resources/expected-pom.xml
b/geode-core/src/test/resources/expected-pom.xml
index 3bbcc55..006c38e 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -286,11 +286,6 @@
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
- <artifactId>geode-json</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<scope>compile</scope>
</dependency>
diff --git
a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
index 3294d1d..3db97f9 100644
---
a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
+++
b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
@@ -105,9 +105,6 @@ public class HeadlessGfsh implements ResultHandler {
if (!success && shell.output != null) {
outputString = shell.output.toString();
shell.output.reset();
- // System.out.println("Bruce: HeadlessGfsh.executeCommand setting
gfsh.outputString to " +
- // outputString);
- Thread.dumpStack();
}
return success;
}
@@ -120,10 +117,6 @@ public class HeadlessGfsh implements ResultHandler {
@Override
public void handleExecutionResult(Object result, String sysout) {
queue.add(result);
- // System.out.println("Bruce: HeadlessGfsh.handleExecutionResult result
class is " +
- // result.getClass() + " toString=" + result);
- // System.out.println("Bruce: HeadlessGfsh.handleExecutionResult is
setting gfsh.outputString to
- // \"" + sysout + "\"");
outputString = sysout;
}
@@ -133,7 +126,6 @@ public class HeadlessGfsh implements ResultHandler {
return null;
try {
Object result = queue.poll(timeout, TimeUnit.SECONDS);
- // System.out.println("Bruce: HeadlessGfsh.getResult found " + result);
queue.clear();
if (!(result instanceof
org.apache.geode.management.internal.cli.result.CommandResult)) {
if (result == null) {
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
b/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
index 42348e9..eb25ebf 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
@@ -256,8 +256,6 @@ public class GfshCommandRule extends
DescribedExternalResource {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- // System.out.println("Bruce: GfshCommandRule.executeCommand
- // gfsh.outputString="+gfsh.outputString);
if (StringUtils.isBlank(gfsh.outputString) && result != null
&& !result.getMessageFromContent().isEmpty()) {
if (result.getStatus() == Result.Status.ERROR) {
diff --git a/geode-dunit/src/test/resources/expected-pom.xml
b/geode-dunit/src/test/resources/expected-pom.xml
index f7d2e1b..2d1edf3 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -63,11 +63,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-json</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<scope>compile</scope>
diff --git a/geode-web-api/src/test/resources/expected-pom.xml
b/geode-web-api/src/test/resources/expected-pom.xml
index 45031ee..d30d97b 100644
--- a/geode-web-api/src/test/resources/expected-pom.xml
+++ b/geode-web-api/src/test/resources/expected-pom.xml
@@ -47,6 +47,11 @@
</dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-json</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>compile</scope>
