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 2015/12/16 21:52:40 UTC
[1/2] incubator-brooklyn git commit: Proper ordering of catalog config
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master e6235d9bc -> 9dc1cb4a4
Proper ordering of catalog config
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fdf1f66c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fdf1f66c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fdf1f66c
Branch: refs/heads/master
Commit: fdf1f66c0bec33dd0668872c5a934064f9956897
Parents: e6235d9
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Dec 16 09:52:28 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Dec 16 21:26:40 2015 +0200
----------------------------------------------------------------------
.../apache/brooklyn/rest/transform/CatalogTransformer.java | 4 +++-
.../apache/brooklyn/rest/transform/EntityTransformer.java | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fdf1f66c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
index 0f710bc..74625fd 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.rest.transform;
import java.net.URI;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType;
@@ -73,8 +74,9 @@ public class CatalogTransformer {
EntityDynamicType typeMap = BrooklynTypes.getDefinedEntityType(spec.getType());
EntityType type = typeMap.getSnapshot();
+ AtomicInteger paramPriorityCnt = new AtomicInteger();
for (SpecParameter<?> input: spec.getParameters())
- config.add(EntityTransformer.entityConfigSummary(input));
+ config.add(EntityTransformer.entityConfigSummary(input, paramPriorityCnt));
for (Sensor<?> x: type.getSensors())
sensors.add(SensorTransformer.sensorSummaryForCatalog(x));
for (Effector<?> x: type.getEffectors())
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fdf1f66c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
index 803acd9..2d9f8a0 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Field;
import java.net.URI;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.brooklyn.api.catalog.CatalogConfig;
import org.apache.brooklyn.api.entity.Application;
@@ -153,8 +154,11 @@ public class EntityTransformer {
return entityConfigSummary(config, label, priority, null);
}
- public static EntityConfigSummary entityConfigSummary(SpecParameter<?> input) {
- Double priority = input.isPinned() ? Double.valueOf(1d) : null;
+ public static EntityConfigSummary entityConfigSummary(SpecParameter<?> input, AtomicInteger paramPriorityCnt) {
+ // Increment the priority because the config container is a set. Server-side we are using an ordered set
+ // which results in correctly ordered items on the wire (as a list). Clients which use the java bindings
+ // though will push the items in an unordered set - so give them means to recover the correct order.
+ Double priority = input.isPinned() ? Double.valueOf(paramPriorityCnt.incrementAndGet()) : null;
return entityConfigSummary(input.getType(), input.getLabel(), priority, null);
}
[2/2] incubator-brooklyn git commit: This closes #1111
Posted by al...@apache.org.
This closes #1111
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9dc1cb4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9dc1cb4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9dc1cb4a
Branch: refs/heads/master
Commit: 9dc1cb4a4406e957e8df83edf7d2bb8dce9edcee
Parents: e6235d9 fdf1f66
Author: Aled Sage <al...@gmail.com>
Authored: Wed Dec 16 20:52:11 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Dec 16 20:52:11 2015 +0000
----------------------------------------------------------------------
.../apache/brooklyn/rest/transform/CatalogTransformer.java | 4 +++-
.../apache/brooklyn/rest/transform/EntityTransformer.java | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------