brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreatu...@apache.org
Subject [01/10] git commit: Fix IntelliJ compilation oddity
Date Wed, 09 Jul 2014 09:53:46 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master f6b5e90f0 -> 2373a6fa7


Fix IntelliJ compilation oddity

The code as it was does not build in IntelliJ, although the IDE editor
does not detect there is a problem; only at compile time. The change
fixes the compilation issue without changing the behaviour.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/31d30d53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/31d30d53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/31d30d53

Branch: refs/heads/master
Commit: 31d30d53aa2a5402cc8ae3ea6a421ac54635785a
Parents: 1a9732e
Author: Richard Downer <richard@apache.org>
Authored: Mon Jul 7 14:03:14 2014 +0100
Committer: Richard Downer <richard@apache.org>
Committed: Mon Jul 7 14:04:48 2014 +0100

----------------------------------------------------------------------
 core/src/test/java/brooklyn/enricher/EnrichersTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31d30d53/core/src/test/java/brooklyn/enricher/EnrichersTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/enricher/EnrichersTest.java b/core/src/test/java/brooklyn/enricher/EnrichersTest.java
index 9ad2c59..bab528a 100644
--- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java
+++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java
@@ -84,7 +84,7 @@ public class EnrichersTest extends BrooklynAppUnitTestSupport {
                 .computing(new Function<Iterable<Integer>, Object>() {
                         @Override public Object apply(Iterable<Integer> input) {
                             if (input != null && Iterables.contains(input, 123))
{
-                                return Enrichers.sum((Iterable)input, 0, 0, TypeTokens.getTypeToken(null,
Integer.class));
+                                return Enrichers.sum(input, 0, 0, new TypeToken<Integer>(){});
                             } else {
                                 return Entities.UNCHANGED;
                             }
@@ -311,7 +311,7 @@ public class EnrichersTest extends BrooklynAppUnitTestSupport {
                 .computing(new Function<Iterable<Integer>, Object>() {
                         @Override public Object apply(Iterable<Integer> input) {
                             if (input != null && Iterables.contains(input, 123))
{
-                                return Enrichers.sum((Iterable)input, 0, 0, TypeTokens.getTypeToken(null,
Integer.class));
+                                return Enrichers.sum(input, 0, 0, new TypeToken<Integer>(){});
                             } else {
                                 return Entities.UNCHANGED;
                             }


Mime
View raw message