You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/05/22 14:13:39 UTC
[1/2] brooklyn-library git commit: Fix generics usage (for
compilation in Eclipse)
Repository: brooklyn-library
Updated Branches:
refs/heads/master 2ea4732a7 -> 2ce0f426b
Fix generics usage (for compilation in Eclipse)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/b15672c6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/b15672c6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/b15672c6
Branch: refs/heads/master
Commit: b15672c6198322039481b306cae0904a06514495
Parents: 2ea4732
Author: Aled Sage <al...@gmail.com>
Authored: Mon May 22 14:47:02 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon May 22 14:47:02 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java | 4 ++--
.../brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b15672c6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java
index cbc0272..e0314ab 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java
@@ -134,11 +134,11 @@ public class MySqlClusterImpl extends DynamicClusterImpl implements MySqlCluster
.build());
}
- private void propagateMasterAttribute(AttributeSensor<?> att) {
+ private <T> void propagateMasterAttribute(AttributeSensor<T> att) {
enrichers().add(Enrichers.builder()
.aggregating(att)
.publishing(att)
- .computing(IfFunctions.ifPredicate(CollectionFunctionals.notEmpty())
+ .computing(IfFunctions.<Collection<T>>ifPredicate(CollectionFunctionals.notEmpty())
.apply(CollectionFunctionals.firstElement())
.defaultValue(null))
.entityFilter(MySqlClusterUtils.IS_MASTER)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b15672c6/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
index 79003c2..5322c22 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
@@ -336,7 +336,8 @@ public class CassandraDatacenterImpl extends DynamicClusterImpl implements Cassa
protected Entity replaceMember(Entity member, Location memberLoc, Map<?, ?> extraFlags) {
Set<BigInteger> oldTokens = ((CassandraNode) member).getTokens();
Set<BigInteger> newTokens = (oldTokens != null && oldTokens.size() > 0) ? getTokenGenerator().getTokensForReplacementNode(oldTokens) : null;
- return super.replaceMember(member, memberLoc, MutableMap.copyOf(extraFlags).add(CassandraNode.TOKENS, newTokens));
+ MutableMap<Object, Object> allFlags = MutableMap.<Object, Object>copyOf(extraFlags).add(CassandraNode.TOKENS, newTokens);
+ return super.replaceMember(member, memberLoc, allFlags);
}
@Override
[2/2] brooklyn-library git commit: Closes #113
Posted by ge...@apache.org.
Closes #113
Fix generics usage (for compilation in Eclipse)
Similar to https://github.com/apache/brooklyn-server/pull/691
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/2ce0f426
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/2ce0f426
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/2ce0f426
Branch: refs/heads/master
Commit: 2ce0f426bdeef54eeb7cc75ec77f5817b8ce2df7
Parents: 2ea4732 b15672c
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon May 22 15:13:27 2017 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon May 22 15:13:27 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java | 4 ++--
.../brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------