You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/02/06 10:37:08 UTC
[1/4] brooklyn-server git commit: Compile with jdk 8
Repository: brooklyn-server
Updated Branches:
refs/heads/master 68a07aa10 -> 55ec074f4
Compile with jdk 8
- minor source changes (generics)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a560c7cf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a560c7cf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a560c7cf
Branch: refs/heads/master
Commit: a560c7cfa3229816a511e4f7e57aa548f876d29a
Parents: 7f1846c
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Tue Dec 13 16:19:01 2016 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Tue Dec 13 17:13:38 2016 +0100
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++---
.../core/config/MapListAndOtherStructuredConfigKeyTest.java | 6 +++---
.../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a560c7cf/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index 7274b2e..cfe5878 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@ -486,8 +486,8 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> {
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target entity not available");
EntityInternal targetEntity = (EntityInternal) targetEntityMaybe.get();
- ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyName);
- Maybe<? extends Object> result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
+ ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
+ Maybe result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
return Maybe.<Object>cast(result);
}
@@ -501,7 +501,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> {
@Override
public Object call() throws Exception {
Entity targetEntity = component.get();
- ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyName);
+ ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
return targetEntity.getConfig(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
}})
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a560c7cf/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
index bfe1126..3e2d9c6 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
@@ -225,7 +225,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS
@Test
public void testSetConfigKeyClear() throws Exception {
entity.config().set(TestEntity.CONF_SET_THING.subKey(), "aval");
- entity.config().set((ConfigKey)TestEntity.CONF_SET_THING, SetModifications.clearing());
+ entity.config().set((ConfigKey)TestEntity.CONF_SET_THING, (Object) SetModifications.clearing());
// for now defaults to null, but empty list might be better? or whatever the default is?
assertEquals(entity.getConfig(TestEntity.CONF_SET_THING), null);
}
@@ -286,7 +286,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS
@Test // ListConfigKey deprecated, as order no longer guaranteed
public void testListConfigKeyClear() throws Exception {
entity.config().set(TestEntity.CONF_LIST_THING.subKey(), "aval");
- entity.config().set((ConfigKey)TestEntity.CONF_LIST_THING, ListModifications.clearing());
+ entity.config().set((ConfigKey)TestEntity.CONF_LIST_THING, (Object) ListModifications.clearing());
// for now defaults to null, but empty list might be better? or whatever the default is?
assertEquals(entity.getConfig(TestEntity.CONF_LIST_THING), null);
}
@@ -342,7 +342,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS
@Test
public void testMapConfigClearMod() throws Exception {
entity.config().set(TestEntity.CONF_MAP_THING.subKey("akey"), "aval");
- entity.config().set((ConfigKey)TestEntity.CONF_MAP_THING, MapModifications.clearing());
+ entity.config().set((ConfigKey)TestEntity.CONF_MAP_THING, (Object) MapModifications.clearing());
// for now defaults to null, but empty map might be better? or whatever the default is?
assertEquals(entity.getConfig(TestEntity.CONF_MAP_THING), null);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a560c7cf/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
index b57625a..00cb545 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
@@ -43,7 +43,7 @@ public class EnumTypeCoercions {
* <p>
* Returns {@code defaultValue} if the string cannot be converted.
*
- * @see TypeCoercions#coerce(Object, Class)
+ * @see EnumTypeCoercions#tryCoerce(String, Class)
* @see Enum#valueOf(Class, String)
*/
public static <E extends Enum<E>> Function<String, E> stringToEnum(final Class<E> type, @Nullable final E defaultValue) {
@@ -74,7 +74,7 @@ public class EnumTypeCoercions {
if (input==null) return null;
if (targetType==null) return Maybe.absent("Null enum type");
if (!targetType.isEnum()) return Maybe.absent("Type '"+targetType+"' is not an enum");
- return tryCoerce(input, (Class<Enum>)targetType);
+ return tryCoerce(input, (Class)targetType);
}
public static <E extends Enum<E>> Maybe<E> tryCoerce(String input, Class<E> targetType) {
[4/4] brooklyn-server git commit: This closes #488
Posted by dr...@apache.org.
This closes #488
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/55ec074f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/55ec074f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/55ec074f
Branch: refs/heads/master
Commit: 55ec074f4932a50c932f985c848a9be6beb8e30e
Parents: 68a07aa 7ec5869
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Feb 6 10:36:03 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Feb 6 10:36:03 2017 +0000
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++---
.../core/config/MapListAndOtherStructuredConfigKeyTest.java | 6 +++---
.../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: Java 7
Posted by dr...@apache.org.
Java 7
- restore java.version to 1.7
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7ec5869c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7ec5869c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7ec5869c
Branch: refs/heads/master
Commit: 7ec5869c33bcbf69f23e42589ec004d9f78dabed
Parents: f0f64f2
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Wed Dec 14 12:17:29 2016 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Wed Dec 14 12:17:29 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7ec5869c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2608ea..f6911c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<!-- Compilation -->
- <java.version>1.8</java.version>
+ <java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[2/4] brooklyn-server git commit: Reinstate generics
Posted by dr...@apache.org.
Reinstate generics
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f0f64f2b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f0f64f2b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f0f64f2b
Branch: refs/heads/master
Commit: f0f64f2bf09a1f2f3bcf2747a9e291afcd9dc8ab
Parents: a560c7c
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Wed Dec 14 11:21:35 2016 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Wed Dec 14 11:33:27 2016 +0100
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++---
pom.xml | 2 +-
.../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index cfe5878..3d5fbf0 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@ -486,8 +486,8 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> {
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target entity not available");
EntityInternal targetEntity = (EntityInternal) targetEntityMaybe.get();
- ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
- Maybe result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
+ ConfigKey<Object> key = (ConfigKey<Object>) targetEntity.getEntityType().getConfigKey(keyName);
+ Maybe<Object> result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
return Maybe.<Object>cast(result);
}
@@ -501,7 +501,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> {
@Override
public Object call() throws Exception {
Entity targetEntity = component.get();
- ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
+ ConfigKey<Object> key = (ConfigKey<Object>) targetEntity.getEntityType().getConfigKey(keyName);
return targetEntity.getConfig(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
}})
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f6911c7..f2608ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<!-- Compilation -->
- <java.version>1.7</java.version>
+ <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
index 00cb545..4638b43 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
@@ -70,11 +70,11 @@ public class EnumTypeCoercions {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static <T> Maybe<T> tryCoerceUntyped(String input, Class<T> targetType) {
+ public static Maybe tryCoerceUntyped(String input, Class targetType) {
if (input==null) return null;
if (targetType==null) return Maybe.absent("Null enum type");
if (!targetType.isEnum()) return Maybe.absent("Type '"+targetType+"' is not an enum");
- return tryCoerce(input, (Class)targetType);
+ return tryCoerce(input, targetType);
}
public static <E extends Enum<E>> Maybe<E> tryCoerce(String input, Class<E> targetType) {