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 da760e5 commented out debug statements that will later be removed
da760e5 is described below
commit da760e587a12537fa486dc244c4490ce756a5a36
Author: Bruce Schuchardt <[email protected]>
AuthorDate: Tue Mar 12 16:06:35 2019 -0700
commented out debug statements that will later be removed
---
.../geode/management/internal/cli/json/GfJsonObject.java | 14 ++++----------
.../internal/cli/result/LegacyCommandResult.java | 2 +-
.../internal/cli/result/ModelCommandResult.java | 2 +-
.../apache/geode/management/internal/cli/shell/Gfsh.java | 16 +++++++---------
.../web/controllers/ShellCommandsController.java | 5 -----
.../geode/management/internal/cli/HeadlessGfsh.java | 13 ++++++-------
.../apache/geode/test/junit/rules/GfshCommandRule.java | 4 ++--
7 files changed, 21 insertions(+), 35 deletions(-)
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 9d667cc..eb0418a 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
@@ -146,14 +146,8 @@ public class GfJsonObject extends AbstractJSONFormatter {
}
public String getString(String key) {
- System.out.println("Bruce: rootNode.getString(" + key + ") =" +
rootNode.get(key)/*
-
* +
-
* " (rootNode="
-
* +rootNode+
-
* ")"
-
*/);
- if (key.equals("fileToDownload"))
- Thread.dumpStack();
+ // System.out.println("Bruce: rootNode.getString(" + key + ") =" +
rootNode.get(key)/* + "
+ // (rootNode="+rootNode+")"*/);
JsonNode node = rootNode.get(key);
if (node == null) {
return null; // "null";
@@ -343,8 +337,8 @@ 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());
+ // 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)) {
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 afed0f1..4fcea83 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
@@ -422,7 +422,7 @@ public class LegacyCommandResult implements CommandResult {
@Override
public List<String> getListFromContent(String key) {
- System.out.println("BRUCE: LegacyCommandResult.getListFromContentString("
+ 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 dfe8e00..3031c2b 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,7 @@ public class ModelCommandResult implements CommandResult {
@Override
public List<String> getListFromContent(String key) {
- System.out.println("BRUCE: ModelCommandResult.getListFromContentString(" +
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 0e01adb..20499df 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
@@ -270,23 +270,21 @@ public class Gfsh extends JLineShell {
}
public static void println() {
- System.out.println("Bruce: println()");
- gfshout.println();
+ // System.out.println("Bruce: println()"); gfshout.println();
}
public static <T> void println(T toPrint) {
- System.out.println("Bruce: println(" + "\"" + toPrint + "\")");
+ // System.out.println("Bruce: println(" + "\"" + toPrint + "\")");
gfshout.println(toPrint);
}
public static <T> void print(T toPrint) {
- System.out.print("Bruce: print(\"" + toPrint + "\")");
+ // System.out.print("Bruce: print(\"" + toPrint + "\")");
gfshout.print(toPrint);
}
public static <T> void printlnErr(T toPrint) {
- System.err.println("Bruce: printlnErr(\"" + toPrint + "\"");
- Thread.dumpStack();
+ // System.err.println("Bruce: printlnErr(\""+toPrint+"\"");
gfsherr.println(toPrint);
}
@@ -712,7 +710,7 @@ public class Gfsh extends JLineShell {
// Normal Command
while (commandResult.hasNextLine()) {
String nextLine = commandResult.nextLine();
- System.out.println("Bruce: Gfsh.handleExecutionResult writing "
+ nextLine);
+ // System.out.println("Bruce: Gfsh.handleExecutionResult writing
" + nextLine);
write(nextLine, isError);
}
} else if (!suppressScriptCmdOutput) {
@@ -729,7 +727,7 @@ 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");
+ // System.out.println("Bruce: Gfsh.handleExecutionResult processing
LegacyCommandResult");
CommandResult cmdResult = (CommandResult) result;
if (cmdResult.hasIncomingFiles()) {
boolean isAlreadySaved = cmdResult.getNumTimesSaved() > 0;
@@ -741,7 +739,7 @@ public class Gfsh extends JLineShell {
}
}
if (result != null && !(result instanceof Result)) {
- System.out.println("Bruce: Gfsh.handleExecutionResult is printing " +
result);
+ // System.out.println("Bruce: Gfsh.handleExecutionResult is printing
"+result);
printAsInfo(result.toString());
}
} catch (Exception e) {
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 e070cd6..16e53e5 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
@@ -48,7 +48,6 @@ import org.springframework.web.multipart.MultipartFile;
import org.apache.geode.annotations.Immutable;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.management.cli.Result;
@@ -192,12 +191,8 @@ public class ShellCommandsController extends
AbstractCommandsController {
private ResponseEntity<InputStreamResource> getResponse(String result) {
CommandResult commandResult = ResultBuilder.fromJson(result);
if (commandResult.getStatus().equals(Result.Status.OK) &&
commandResult.hasFileToDownload()) {
- InternalDistributedSystem.getLogger()
- .info("Bruce: returning file download response from
ShellCommandsController.getResponse");
return getFileDownloadResponse(commandResult);
} else {
- InternalDistributedSystem.getLogger()
- .info("Bruce: returning json response from
ShellCommandsController.getResponse");
return getJsonResponse(result);
}
}
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 2a31f6f..3294d1d 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,8 +105,8 @@ 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);
+ // System.out.println("Bruce: HeadlessGfsh.executeCommand setting
gfsh.outputString to " +
+ // outputString);
Thread.dumpStack();
}
return success;
@@ -120,11 +120,10 @@ 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 + "\"");
+ // 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;
}
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 3e3fc0d..42348e9 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,8 @@ public class GfshCommandRule extends
DescribedExternalResource {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- System.out
- .println("Bruce: GfshCommandRule.executeCommand gfsh.outputString=" +
gfsh.outputString);
+ // 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) {
