Fix some trivial compiler warnings Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ae7532c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ae7532c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ae7532c6
Branch: refs/heads/master Commit: ae7532c61c737410576db9a60ce89b2fa6cd715b Parents: 484d9d4 Author: Aled Sage <[email protected]> Authored: Thu Nov 12 14:34:17 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Thu Nov 12 14:34:17 2015 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/util/JavaGroovyEquivalents.java | 9 +++++---- .../org/apache/brooklyn/util/maven/MavenArtifactTest.java | 10 +++++++--- .../test/support/TestResourceUnavailableException.java | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae7532c6/utils/common/src/main/java/org/apache/brooklyn/util/JavaGroovyEquivalents.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/JavaGroovyEquivalents.java b/utils/common/src/main/java/org/apache/brooklyn/util/JavaGroovyEquivalents.java index 94f9a04..6c25ea7 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/JavaGroovyEquivalents.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/JavaGroovyEquivalents.java @@ -72,6 +72,7 @@ public class JavaGroovyEquivalents { public static <T> T elvis(Iterable<?> preferences) { return elvis(Iterables.toArray(preferences, Object.class)); } + @SuppressWarnings("unchecked") public static <T> T elvis(Object... preferences) { if (preferences.length == 0) throw new IllegalArgumentException("preferences must not be empty for elvis"); for (Object contender : preferences) { @@ -109,13 +110,13 @@ public class JavaGroovyEquivalents { } else if (o instanceof String) { return !((String)o).isEmpty(); } else if (o instanceof Collection) { - return !((Collection)o).isEmpty(); + return !((Collection<?>)o).isEmpty(); } else if (o instanceof Map) { - return !((Map)o).isEmpty(); + return !((Map<?,?>)o).isEmpty(); } else if (o instanceof Iterator) { - return ((Iterator)o).hasNext(); + return ((Iterator<?>)o).hasNext(); } else if (o instanceof Enumeration) { - return ((Enumeration)o).hasMoreElements(); + return ((Enumeration<?>)o).hasMoreElements(); } else { return true; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae7532c6/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java index e1028e1..654eebd 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java @@ -198,9 +198,13 @@ public class MavenArtifactTest { // Note URLClassLoader.close was only added in Java 7; do not call it until Java 6 support is not needed! URL realUrl = followRedirects(new URL(url)); URLClassLoader classLoader = new URLClassLoader(new URL[] { realUrl }); - URL innerU = classLoader.findResource(resource); - InputStream innerUin = innerU.openConnection().getInputStream(); - innerUin.close(); + try { + URL innerU = classLoader.findResource(resource); + InputStream innerUin = innerU.openConnection().getInputStream(); + innerUin.close(); + } finally { + classLoader.close(); + } } /* http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae7532c6/utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUnavailableException.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUnavailableException.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUnavailableException.java index 1596801..cb4205f 100644 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUnavailableException.java +++ b/utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUnavailableException.java @@ -42,9 +42,10 @@ import static com.google.common.base.Preconditions.checkNotNull; * is not available. The exception message is then derived from this. The two-string constructors take both the * resource name and an explicit exception message.</p> */ -@SuppressWarnings("UnusedDeclaration") public class TestResourceUnavailableException extends SkipException { + private static final long serialVersionUID = -6150059547094292069L; + private final String resourceName; /**
