From 15a203c0cab2142d04d426d77db9c45a76e61bf6 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Mon, 22 May 2017 14:04:30 +0100 Subject: [PATCH] Fix generics usage (for compilation in Eclipse) --- .../java/org/apache/brooklyn/api/sensor/EnricherSpec.java | 2 +- .../spi/resolve/interpret/PlanInterpretationContext.java | 2 +- .../brooklyn/core/network/OnPublicNetworkEnricherTest.java | 4 +--- .../org/apache/brooklyn/rest/resources/CatalogResource.java | 4 ++-- .../java/org/apache/brooklyn/util/javalang/Reflections.java | 6 +++--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java b/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java index 2cd99a638b..8e02fb85d7 100644 --- a/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java +++ b/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java @@ -57,7 +57,7 @@ public static EnricherSpec create(Class typ * @param config The spec's configuration (see {@link EnricherSpec#configure(Map)}). * @param type An {@link Enricher} class */ - public static EnricherSpec create(Map config, Class type) { + public static EnricherSpec create(Map config, Class type) { return EnricherSpec.create(type).configure(config); } diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java index f45d7c6e29..d006627a02 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java @@ -34,7 +34,7 @@ public class PlanInterpretationContext { public PlanInterpretationContext(Map originalDeploymentPlan, List interpreters) { super(); - this.originalDeploymentPlan = MutableMap.copyOf(originalDeploymentPlan).asUnmodifiable(); + this.originalDeploymentPlan = MutableMap.copyOf(originalDeploymentPlan).asUnmodifiable(); this.interpreters = ImmutableList.copyOf(interpreters); this.allInterpreter = new PlanInterpreter() { @Override diff --git a/core/src/test/java/org/apache/brooklyn/core/network/OnPublicNetworkEnricherTest.java b/core/src/test/java/org/apache/brooklyn/core/network/OnPublicNetworkEnricherTest.java index 533ea34847..839c5d1efd 100644 --- a/core/src/test/java/org/apache/brooklyn/core/network/OnPublicNetworkEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/network/OnPublicNetworkEnricherTest.java @@ -362,7 +362,6 @@ public void testDoesNotDoRegexMatchingWhenSensorsSpecified() throws Exceptio } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) public void testCoercesSensorName() throws Exception { AttributeSensor sensor = Sensors.newStringSensor("mysensor"); @@ -370,9 +369,8 @@ public void testCoercesSensorName() throws Exception { portForwardManager.associate("myPublicIp", HostAndPort.fromParts("mypublichost", 5678), machine, 1234); entity.addLocations(ImmutableList.of(machine)); - // Ugly casting in java, but easy to get passed this when constructed from YAML entity.enrichers().add(EnricherSpec.create(OnPublicNetworkEnricher.class) - .configure(OnPublicNetworkEnricher.SENSORS, ((List)ImmutableList.of("mysensor")))); + .configure(OnPublicNetworkEnricher.SENSORS.getName(), ImmutableList.of("mysensor"))); assertAttributeEqualsEventually("mysensor.mapped.public", "mypublichost:5678"); } diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 7a7f7f7783..74e16a6cac 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -377,8 +377,8 @@ public CatalogEntitySummary getEntity(String symbolicName, String version) { //TODO These casts are not pretty, we could just provide separate get methods for the different types? //Or we could provide asEntity/asPolicy cast methods on the CataloItem doing a safety check internally @SuppressWarnings("unchecked") - CatalogItem> result = - (CatalogItem>) brooklyn().getCatalog().getCatalogItem(symbolicName, version); + CatalogItem> result = + (CatalogItem>) brooklyn().getCatalog().getCatalogItem(symbolicName, version); if (result==null) { throw WebResourceUtils.notFound("Entity with id '%s:%s' not found", symbolicName, version); diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Reflections.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Reflections.java index beedc7faac..6929dd74a6 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Reflections.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Reflections.java @@ -242,15 +242,15 @@ public static Optional invokeConstructorWithArgs(ClassLoader classLoader, } /** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated public static Optional invokeConstructorWithArgs(Class clazz, Object...argsArray) { - return invokeConstructorFromArgs(clazz, argsArray).toOptional(); + return Reflections.invokeConstructorFromArgs(clazz, argsArray).toOptional(); } /** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated public static Optional invokeConstructorWithArgs(Class clazz, Object[] argsArray, boolean setAccessible) { - return invokeConstructorFromArgs(clazz, argsArray, setAccessible).toOptional(); + return Reflections.invokeConstructorFromArgs(clazz, argsArray, setAccessible).toOptional(); } /** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated public static Optional invokeConstructorWithArgs(Reflections reflections, Class clazz, Object[] argsArray, boolean setAccessible) { - return invokeConstructorFromArgs(reflections, clazz, argsArray, setAccessible).toOptional(); + return Reflections.invokeConstructorFromArgs(reflections, clazz, argsArray, setAccessible).toOptional(); } /** Finds and invokes a suitable constructor, supporting varargs and primitives, boxing and looking at compatible supertypes in the constructor's signature */