Repository: geode Updated Branches: refs/heads/feature/GEODE-2632-21 eab9e6e07 -> 16ea5e3c6
fixup Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/16ea5e3c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/16ea5e3c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/16ea5e3c Branch: refs/heads/feature/GEODE-2632-21 Commit: 16ea5e3c65fa2172b391bdb050eb07d688605e5d Parents: eab9e6e Author: Kirk Lund <[email protected]> Authored: Mon Jun 5 10:16:58 2017 -0700 Committer: Kirk Lund <[email protected]> Committed: Mon Jun 5 10:16:58 2017 -0700 ---------------------------------------------------------------------- .../management/internal/cli/commands/DataCommands.java | 7 +++---- .../internal/cli/commands/DeployCommands.java | 4 +++- .../codeAnalysis/AnalyzeSerializablesJUnitTest.java | 12 ++++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/16ea5e3c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java index 62113de..f665a67 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java @@ -154,14 +154,14 @@ public class DataCommands implements GfshCommand { } ExecuteRebalanceWithTimeout(String[] includedRegions, String[] excludedRegions, - boolean toSimulate) { + boolean toSimulate) { includeRegions = includedRegions; excludeRegions = excludedRegions; simulate = toSimulate; } Result executeRebalanceWithTimeout(String[] includeRegions, String[] excludeRegions, - boolean simulate) { + boolean simulate) { Result result = null; try { @@ -475,8 +475,7 @@ public class DataCommands implements GfshCommand { } private CompositeResultData toCompositeResultData(CompositeResultData rebalanceResulteData, - ArrayList<String> rstlist, int index, - boolean simulate, InternalCache cache) { + ArrayList<String> rstlist, int index, boolean simulate, InternalCache cache) { // add only if there are any valid regions in results if (rstlist.size() > resultItemCount && StringUtils.isNotEmpty(rstlist.get(resultItemCount))) { http://git-wip-us.apache.org/repos/asf/geode/blob/16ea5e3c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java index 268dc7a..8511de8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java @@ -14,6 +14,8 @@ */ package org.apache.geode.management.internal.cli.commands; +import static org.apache.commons.io.FileUtils.ONE_MB; + import org.apache.geode.SystemFailure; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; @@ -322,7 +324,7 @@ public class DeployCommands implements GfshCommand { if (dir != null) { String message = "\nDeploying files: " + fileResult.getFormattedFileList() + "\nTotal file size is: " - + this.numFormatter.format((double) fileResult.computeFileSizeTotal() / 1048576) + + this.numFormatter.format((double) fileResult.computeFileSizeTotal() / ONE_MB) + "MB\n\nContinue? "; if (readYesNo(message, Response.YES) == Response.NO) { http://git-wip-us.apache.org/repos/asf/geode/blob/16ea5e3c/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java index c9b8d6b..079448d 100644 --- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java @@ -122,8 +122,10 @@ public class AnalyzeSerializablesJUnitTest { fail( diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the " + "\norg/apache/geode/codeAnalysis directory. Otherwise if this doesn't " - + "\nbreak backward compatibility move the file " + this.actualDataSerializablesFile.getAbsolutePath() + " to the codeAnalysis " - + "\ntest directory and rename to " + this.expectedDataSerializablesFile.getAbsolutePath()); + + "\nbreak backward compatibility move the file " + + this.actualDataSerializablesFile.getAbsolutePath() + " to the codeAnalysis " + + "\ntest directory and rename to " + + this.expectedDataSerializablesFile.getAbsolutePath()); } } @@ -142,8 +144,10 @@ public class AnalyzeSerializablesJUnitTest { fail( diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the " + "\n/org/apache/geode/codeAnalysis/ directory. Otherwise if this doesn't " - + "\nbreak backward compatibility move the file " + this.actualSerializablesFile.getAbsolutePath() + " to the " - + "\ncodeAnalysis test directory and rename to " + this.expectedSerializablesFile.getAbsolutePath()); + + "\nbreak backward compatibility move the file " + + this.actualSerializablesFile.getAbsolutePath() + " to the " + + "\ncodeAnalysis test directory and rename to " + + this.expectedSerializablesFile.getAbsolutePath()); } }
