You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/05/22 19:38:19 UTC
[1/2] brooklyn-server git commit: Fix generics usage (for compilation
in Eclipse)
Repository: brooklyn-server
Updated Branches:
refs/heads/master 1cfc0ed5b -> 2bb8572f4
Fix generics usage (for compilation in Eclipse)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/15a203c0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/15a203c0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/15a203c0
Branch: refs/heads/master
Commit: 15a203c0cab2142d04d426d77db9c45a76e61bf6
Parents: 1cfc0ed
Author: Aled Sage <al...@gmail.com>
Authored: Mon May 22 14:04:30 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon May 22 20:37:18 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java | 2 +-
.../camp/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/15a203c0/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java
----------------------------------------------------------------------
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 2cd99a6..8e02fb8 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 class EnricherSpec<T extends Enricher> extends AbstractBrooklynObjectSpec
* @param config The spec's configuration (see {@link EnricherSpec#configure(Map)}).
* @param type An {@link Enricher} class
*/
- public static <T extends Enricher> EnricherSpec<T> create(Map<?,?> config, Class<? extends T> type) {
+ public static <T extends Enricher> EnricherSpec<T> create(Map<?,?> config, Class<T> type) {
return EnricherSpec.create(type).configure(config);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/15a203c0/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationContext.java
----------------------------------------------------------------------
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 f45d7c6..d006627 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<String,?> originalDeploymentPlan, List<PlanInterpreter> interpreters) {
super();
- this.originalDeploymentPlan = MutableMap.copyOf(originalDeploymentPlan).asUnmodifiable();
+ this.originalDeploymentPlan = MutableMap.<String, Object>copyOf(originalDeploymentPlan).asUnmodifiable();
this.interpreters = ImmutableList.copyOf(interpreters);
this.allInterpreter = new PlanInterpreter() {
@Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/15a203c0/core/src/test/java/org/apache/brooklyn/core/network/OnPublicNetworkEnricherTest.java
----------------------------------------------------------------------
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 533ea34..839c5d1 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 class OnPublicNetworkEnricherTest extends BrooklynAppUnitTestSupport {
}
@Test
- @SuppressWarnings({ "unchecked", "rawtypes" })
public <T> void testCoercesSensorName() throws Exception {
AttributeSensor<String> sensor = Sensors.newStringSensor("mysensor");
@@ -370,9 +369,8 @@ public class OnPublicNetworkEnricherTest extends BrooklynAppUnitTestSupport {
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");
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/15a203c0/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
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 7a7f7f7..74e16a6 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 class CatalogResource extends AbstractBrooklynRestResource implements Cat
//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<Entity, EntitySpec<?>> result =
- (CatalogItem<Entity, EntitySpec<?>>) brooklyn().getCatalog().getCatalogItem(symbolicName, version);
+ CatalogItem<Entity, EntitySpec<? extends Entity>> result =
+ (CatalogItem<Entity, EntitySpec<? extends Entity>>) brooklyn().getCatalog().getCatalogItem(symbolicName, version);
if (result==null) {
throw WebResourceUtils.notFound("Entity with id '%s:%s' not found", symbolicName, version);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/15a203c0/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Reflections.java
----------------------------------------------------------------------
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 beedc7f..6929dd7 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 class Reflections {
}
/** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated
public static <T> Optional<T> invokeConstructorWithArgs(Class<? extends T> clazz, Object...argsArray) {
- return invokeConstructorFromArgs(clazz, argsArray).toOptional();
+ return Reflections.<T>invokeConstructorFromArgs(clazz, argsArray).toOptional();
}
/** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated
public static <T> Optional<T> invokeConstructorWithArgs(Class<? extends T> clazz, Object[] argsArray, boolean setAccessible) {
- return invokeConstructorFromArgs(clazz, argsArray, setAccessible).toOptional();
+ return Reflections.<T>invokeConstructorFromArgs(clazz, argsArray, setAccessible).toOptional();
}
/** @deprecated since 0.10.0 use {@link #invokeConstructorFromArgs(Class, Object...)} or one of the variants */ @Deprecated
public static <T> Optional<T> invokeConstructorWithArgs(Reflections reflections, Class<? extends T> clazz, Object[] argsArray, boolean setAccessible) {
- return invokeConstructorFromArgs(reflections, clazz, argsArray, setAccessible).toOptional();
+ return Reflections.<T>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 */
[2/2] brooklyn-server git commit: This closes #691
Posted by al...@apache.org.
This closes #691
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2bb8572f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2bb8572f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2bb8572f
Branch: refs/heads/master
Commit: 2bb8572f4659e680b2c008db0fef7cbb09ad0150
Parents: 1cfc0ed 15a203c
Author: Aled Sage <al...@gmail.com>
Authored: Mon May 22 20:38:09 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon May 22 20:38:09 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java | 2 +-
.../camp/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(-)
----------------------------------------------------------------------