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/27 12:57:10 UTC
[1/2] brooklyn-server git commit: Add catalog "itemType" to the
CatalogItemSummary response from the REST API
Repository: brooklyn-server
Updated Branches:
refs/heads/master cddaf4a09 -> 17aa62213
Add catalog "itemType" to the CatalogItemSummary response from the REST API
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4ac38b0f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4ac38b0f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4ac38b0f
Branch: refs/heads/master
Commit: 4ac38b0ff9898978bfd611ad5128af49eb130564
Parents: 5e947ce
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Tue Feb 21 17:45:51 2017 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Tue Feb 21 17:45:51 2017 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/api/catalog/CatalogItem.java | 6 ++++++
.../brooklyn/rest/domain/CatalogEntitySummary.java | 3 ++-
.../apache/brooklyn/rest/domain/CatalogItemSummary.java | 12 +++++++++++-
.../brooklyn/rest/domain/CatalogLocationSummary.java | 3 ++-
.../brooklyn/rest/domain/CatalogPolicySummary.java | 3 ++-
.../brooklyn/rest/transform/CatalogTransformer.java | 8 ++++----
6 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
index 41fe87c..6f27af7 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.api.catalog;
import java.util.Collection;
+import java.util.Locale;
import javax.annotation.Nullable;
@@ -62,6 +63,11 @@ public interface CatalogItem<T,SpecT> extends BrooklynObject, Rebindable {
if (Entity.class.isAssignableFrom(type)) return ENTITY;
return null;
}
+
+ @Override
+ public String toString() {
+ return name().toLowerCase(Locale.ENGLISH);
+ }
}
public static interface CatalogBundle extends OsgiBundleWithUrl {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
index 6049660..6d66401 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
@@ -46,6 +46,7 @@ public class CatalogEntitySummary extends CatalogItemSummary {
@JsonProperty("version") String version,
@JsonProperty("name") String name,
@JsonProperty("javaType") String javaType,
+ @JsonProperty("itemType") String itemType,
@JsonProperty("planYaml") String planYaml,
@JsonProperty("description") String description,
@JsonProperty("iconUrl") String iconUrl,
@@ -56,7 +57,7 @@ public class CatalogEntitySummary extends CatalogItemSummary {
@JsonProperty("deprecated") boolean deprecated,
@JsonProperty("links") Map<String, URI> links
) {
- super(symbolicName, version, name, javaType, planYaml, description, iconUrl, tags, deprecated, links);
+ super(symbolicName, version, name, javaType, itemType, planYaml, description, iconUrl, tags, deprecated, links);
this.config = config;
this.sensors = sensors;
this.effectors = effectors;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
index b2555a1..49c838a 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
@@ -50,6 +50,8 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
private final String javaType;
+ private final String itemType;
+
private final String name;
@JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
private final String description;
@@ -67,6 +69,7 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
@JsonProperty("version") String version,
@JsonProperty("name") String displayName,
@JsonProperty("javaType") String javaType,
+ @JsonProperty("itemType") String itemType,
@JsonProperty("planYaml") String planYaml,
@JsonProperty("description") String description,
@JsonProperty("iconUrl") String iconUrl,
@@ -80,6 +83,7 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
this.version = version;
this.name = displayName;
this.javaType = javaType;
+ this.itemType = itemType;
this.planYaml = planYaml;
this.description = description;
this.iconUrl = iconUrl;
@@ -105,6 +109,10 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
return javaType;
}
+ public String getItemType() {
+ return itemType;
+ }
+
public String getType() {
return type;
}
@@ -148,6 +156,7 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
Objects.equals(symbolicName, that.symbolicName) &&
Objects.equals(version, that.version) &&
Objects.equals(type, that.type) &&
+ Objects.equals(itemType, that.itemType) &&
Objects.equals(javaType, that.javaType) &&
Objects.equals(name, that.name) &&
Objects.equals(description, that.description) &&
@@ -159,7 +168,7 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
@Override
public int hashCode() {
- return Objects.hash(id, symbolicName, version, type, javaType, name, description, iconUrl, planYaml, tags, deprecated, links);
+ return Objects.hash(id, symbolicName, version, type, javaType, itemType, name, description, iconUrl, planYaml, tags, deprecated, links);
}
@Override
@@ -170,6 +179,7 @@ public class CatalogItemSummary implements HasId, HasName, Serializable {
", version='" + version + '\'' +
", type='" + type + '\'' +
", javaType='" + javaType + '\'' +
+ ", itemType='" + itemType + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +
", iconUrl='" + iconUrl + '\'' +
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
index eb061c5..883232b 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
@@ -37,6 +37,7 @@ public class CatalogLocationSummary extends CatalogItemSummary {
@JsonProperty("version") String version,
@JsonProperty("name") String name,
@JsonProperty("javaType") String javaType,
+ @JsonProperty("itemType") String itemType,
@JsonProperty("planYaml") String planYaml,
@JsonProperty("description") String description,
@JsonProperty("iconUrl") String iconUrl,
@@ -45,7 +46,7 @@ public class CatalogLocationSummary extends CatalogItemSummary {
@JsonProperty("deprecated") boolean deprecated,
@JsonProperty("links") Map<String, URI> links
) {
- super(symbolicName, version, name, javaType, planYaml, description, iconUrl, tags, deprecated, links);
+ super(symbolicName, version, name, javaType, itemType, planYaml, description, iconUrl, tags, deprecated, links);
// TODO expose config from policies
this.config = (config == null) ? ImmutableSet.<LocationConfigSummary>of() : config;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
index 79187eb..396c550 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
@@ -39,6 +39,7 @@ public class CatalogPolicySummary extends CatalogItemSummary {
@JsonProperty("version") String version,
@JsonProperty("name") String name,
@JsonProperty("javaType") String javaType,
+ @JsonProperty("itemType") String itemType,
@JsonProperty("planYaml") String planYaml,
@JsonProperty("description") String description,
@JsonProperty("iconUrl") String iconUrl,
@@ -47,7 +48,7 @@ public class CatalogPolicySummary extends CatalogItemSummary {
@JsonProperty("deprecated") boolean deprecated,
@JsonProperty("links") Map<String, URI> links
) {
- super(symbolicName, version, name, javaType, planYaml, description, iconUrl, tags, deprecated, links);
+ super(symbolicName, version, name, javaType, itemType, planYaml, description, iconUrl, tags, deprecated, links);
// TODO expose config from policies
this.config = (config == null) ? ImmutableSet.<PolicyConfigSummary>of() : config;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ac38b0f/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
index 616768e..5cbe16d 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
@@ -103,7 +103,7 @@ public class CatalogTransformer {
}
return new CatalogEntitySummary(item.getSymbolicName(), item.getVersion(), item.getDisplayName(),
- item.getJavaType(), item.getPlanYaml(),
+ item.getJavaType(), item.getCatalogItemType().toString(), item.getPlanYaml(),
item.getDescription(), tidyIconLink(b, item, item.getIconUrl(), ub),
makeTags(spec, item), config, sensors, effectors,
item.isDeprecated(), makeLinks(item, ub));
@@ -128,7 +128,7 @@ public class CatalogTransformer {
log.warn("Invalid item in catalog when converting REST summaries (supplying generic item), at "+item+": "+e, e);
}
return new CatalogItemSummary(item.getSymbolicName(), item.getVersion(), item.getDisplayName(),
- item.getJavaType(), item.getPlanYaml(),
+ item.getJavaType(), item.getCatalogItemType().toString(), item.getPlanYaml(),
item.getDescription(), tidyIconLink(b, item, item.getIconUrl(), ub), item.tags().getTags(), item.isDeprecated(), makeLinks(item, ub));
}
@@ -144,7 +144,7 @@ public class CatalogTransformer {
log.trace("Unable to create policy spec for "+item+": "+e, e);
}
return new CatalogPolicySummary(item.getSymbolicName(), item.getVersion(), item.getDisplayName(),
- item.getJavaType(), item.getPlanYaml(),
+ item.getJavaType(), item.getCatalogItemType().toString(), item.getPlanYaml(),
item.getDescription(), tidyIconLink(b, item, item.getIconUrl(), ub), config,
item.tags().getTags(), item.isDeprecated(), makeLinks(item, ub));
}
@@ -152,7 +152,7 @@ public class CatalogTransformer {
public static CatalogLocationSummary catalogLocationSummary(BrooklynRestResourceUtils b, CatalogItem<? extends Location,LocationSpec<?>> item, UriBuilder ub) {
Set<LocationConfigSummary> config = ImmutableSet.of();
return new CatalogLocationSummary(item.getSymbolicName(), item.getVersion(), item.getDisplayName(),
- item.getJavaType(), item.getPlanYaml(),
+ item.getJavaType(), item.getCatalogItemType().toString(), item.getPlanYaml(),
item.getDescription(), tidyIconLink(b, item, item.getIconUrl(), ub), config,
item.tags().getTags(), item.isDeprecated(), makeLinks(item, ub));
}
[2/2] brooklyn-server git commit: This closes #567
Posted by dr...@apache.org.
This closes #567
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/17aa6221
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/17aa6221
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/17aa6221
Branch: refs/heads/master
Commit: 17aa622137d130a20566c6190bc25d3605ea2c4f
Parents: cddaf4a 4ac38b0
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Feb 27 12:56:35 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Feb 27 12:56:35 2017 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/api/catalog/CatalogItem.java | 6 ++++++
.../brooklyn/rest/domain/CatalogEntitySummary.java | 3 ++-
.../apache/brooklyn/rest/domain/CatalogItemSummary.java | 12 +++++++++++-
.../brooklyn/rest/domain/CatalogLocationSummary.java | 3 ++-
.../brooklyn/rest/domain/CatalogPolicySummary.java | 3 ++-
.../brooklyn/rest/transform/CatalogTransformer.java | 8 ++++----
6 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------