You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2018/08/29 19:58:28 UTC
[geode] branch feature/GEODE-5660 updated: GEODE-5660: spotless
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-5660
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5660 by this push:
new de11332 GEODE-5660: spotless
de11332 is described below
commit de1133297a0df6957ea5615d872f573a9329b613
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Wed Aug 29 12:58:13 2018 -0700
GEODE-5660: spotless
---
.../management/internal/AgentUtilJUnitTest.java | 1 -
.../geode/management/internal/AgentUtil.java | 44 +++++++++++-----------
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
index e253862..c008e1c 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management.internal;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
index fbd1e93..83ec51e 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
@@ -18,10 +18,7 @@ package org.apache.geode.management.internal;
import java.io.File;
import java.net.URL;
import java.util.Arrays;
-import java.util.List;
import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang.StringUtils;
@@ -32,6 +29,7 @@ import org.apache.geode.internal.logging.LogService;
/**
* Hosts common utility methods needed by the management package
+ *
* @since Geode 1.0.0.0
*/
public class AgentUtil {
@@ -49,16 +47,18 @@ public class AgentUtil {
* defined, it will look under tools/Extensions, tools/Pulse and lib folder (in this order) to
* find either the name-version.war or the name.war file 2. If GEODE_HOME is not defined, it will
* try to find either the name-version.war/name.war (in that order) on the classpath
+ *
* @param warFilePrefix : the prefix of the war file, e.g. geode-web, geode-pulse, or
- * geode-web-api
+ * geode-web-api
*/
public String findWarLocation(String warFilePrefix) {
final String versionedWarFileName = warFilePrefix + "-" + gemfireVersion + ".war";
final String unversionedWarFileName = warFilePrefix + ".war";
- //This will attempt to find the war file defined somewhere on the Java classpath,
- //other than the
- String possiblePath = lookupWarLocationFromClasspath(versionedWarFileName, unversionedWarFileName);
+ // This will attempt to find the war file defined somewhere on the Java classpath,
+ // other than the
+ String possiblePath =
+ lookupWarLocationFromClasspath(versionedWarFileName, unversionedWarFileName);
if (possiblePath != null) {
return possiblePath;
}
@@ -81,13 +81,12 @@ public class AgentUtil {
}
private String findPossibleWarLocationFromExtraLocations(String versionedWarFileName,
- String unversionedWarFileName) {
- final URL url = Arrays.stream(new String[]
- {versionedWarFileName,
- "tools/Pulse/" + versionedWarFileName,
- "tools/Extensions/" + versionedWarFileName,
- "lib/" + versionedWarFileName,
- unversionedWarFileName})
+ String unversionedWarFileName) {
+ final URL url = Arrays.stream(new String[] {versionedWarFileName,
+ "tools/Pulse/" + versionedWarFileName,
+ "tools/Extensions/" + versionedWarFileName,
+ "lib/" + versionedWarFileName,
+ unversionedWarFileName})
.map(possibleFile -> this.getClass().getClassLoader().getResource(possibleFile))
.filter(Objects::nonNull).findFirst().orElse(null);
@@ -100,17 +99,16 @@ public class AgentUtil {
}
private String findPossibleWarLocationForGeodeHome(String versionedWarFileName,
- String unversionedWarFileName) {
+ String unversionedWarFileName) {
String[] possibleFiles = {};
String geodeHome = getGeodeHome();
if (StringUtils.isNotBlank(geodeHome)) {
- possibleFiles = new String[]
- {geodeHome + "/tools/Extensions/" + versionedWarFileName,
- geodeHome + "/tools/Pulse/" + versionedWarFileName,
- geodeHome + "/lib/" + versionedWarFileName,
- geodeHome + "/tools/Extensions/" + unversionedWarFileName,
- geodeHome + "/tools/Pulse/" + unversionedWarFileName,
- geodeHome + "/lib/" + unversionedWarFileName};
+ possibleFiles = new String[] {geodeHome + "/tools/Extensions/" + versionedWarFileName,
+ geodeHome + "/tools/Pulse/" + versionedWarFileName,
+ geodeHome + "/lib/" + versionedWarFileName,
+ geodeHome + "/tools/Extensions/" + unversionedWarFileName,
+ geodeHome + "/tools/Pulse/" + unversionedWarFileName,
+ geodeHome + "/lib/" + unversionedWarFileName};
}
return findPossibleWarLocationFromStream(Arrays.stream(possibleFiles));
}
@@ -121,7 +119,7 @@ public class AgentUtil {
}
private String lookupWarLocationFromClasspath(String versionedWarFileName,
- String unversionedWarFileName) {
+ String unversionedWarFileName) {
return Arrays
.stream(System.getProperty("java.class.path").split(File.pathSeparator))
.filter(pathString -> pathString.endsWith(versionedWarFileName) || pathString