You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2016/02/11 20:13:23 UTC
[1/5] brooklyn-server git commit: Stronger assertions in
ApplicationResourceTest
Repository: brooklyn-server
Updated Branches:
refs/heads/master 5b01f8fb2 -> 1a9781546
Stronger assertions in ApplicationResourceTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e7c6fb96
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e7c6fb96
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e7c6fb96
Branch: refs/heads/master
Commit: e7c6fb96e9bbe86ed0f6ebb5b2339af750d2d923
Parents: feab400
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Feb 11 18:21:18 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 18:22:16 2016 +0000
----------------------------------------------------------------------
.../brooklyn/rest/resources/ApplicationResourceTest.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e7c6fb96/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
index 738770d..8b49763 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
@@ -70,6 +70,7 @@ import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.collections.CollectionFunctionals;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.http.HttpAsserts;
+import org.apache.brooklyn.util.text.Strings;
import org.apache.brooklyn.util.time.Duration;
import org.apache.http.HttpHeaders;
import org.apache.http.entity.ContentType;
@@ -363,6 +364,12 @@ public class ApplicationResourceTest extends BrooklynRestResourceTest {
}
Assert.assertNotNull(app);
+ Assert.assertFalse(Strings.isBlank((String) app.get("applicationId")),
+ "expected value for applicationId, was: " + app.get("applicationId"));
+ Assert.assertFalse(Strings.isBlank((String) app.get("serviceState")),
+ "expected value for serviceState, was: " + app.get("serviceState"));
+ Assert.assertNotNull(app.get("serviceUp"), "expected non-null value for serviceUp");
+
Collection children = (Collection) app.get("children");
Assert.assertEquals(children.size(), 2);
[3/5] brooklyn-server git commit: restore TaskSummary field names
isError and isCancelled
Posted by an...@apache.org.
restore TaskSummary field names isError and isCancelled
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/14bd3402
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/14bd3402
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/14bd3402
Branch: refs/heads/master
Commit: 14bd34023dd8dad350290404766831f79f4838db
Parents: 5b01f8f
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Feb 11 17:31:11 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 18:22:16 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/rest/domain/TaskSummary.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14bd3402/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
index 6de384e..4df5027 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
@@ -82,8 +82,8 @@ public class TaskSummary implements HasId, Serializable {
@JsonProperty("endTimeUtc") Long endTimeUtc,
@JsonProperty("currentStatus") String currentStatus,
@JsonProperty("result") Object result,
- @JsonProperty("error") boolean error,
- @JsonProperty("cancelled") boolean cancelled,
+ @JsonProperty("IsError") boolean error,
+ @JsonProperty("isCancelled") boolean cancelled,
@JsonProperty("children") List<LinkWithMetadata> children,
@JsonProperty("submittedByTask") LinkWithMetadata submittedByTask,
@JsonProperty("blockingTask") LinkWithMetadata blockingTask,
[4/5] brooklyn-server git commit: Fix name of isError property in
TaskSummary
Posted by an...@apache.org.
Fix name of isError property in TaskSummary
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d0a764ef
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d0a764ef
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d0a764ef
Branch: refs/heads/master
Commit: d0a764ef0f54e11b0d27f6b59b875882953cccbe
Parents: e7c6fb9
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Feb 11 19:07:23 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 19:07:23 2016 +0000
----------------------------------------------------------------------
.../brooklyn/rest/domain/TaskSummary.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d0a764ef/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
index 4df5027..eef57e6 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
@@ -52,8 +52,8 @@ public class TaskSummary implements HasId, Serializable {
private final String currentStatus;
private final Object result;
- private final boolean error;
- private final boolean cancelled;
+ private final boolean isError;
+ private final boolean isCancelled;
private final List<LinkWithMetadata> children;
private final LinkWithMetadata submittedByTask;
@@ -82,8 +82,8 @@ public class TaskSummary implements HasId, Serializable {
@JsonProperty("endTimeUtc") Long endTimeUtc,
@JsonProperty("currentStatus") String currentStatus,
@JsonProperty("result") Object result,
- @JsonProperty("IsError") boolean error,
- @JsonProperty("isCancelled") boolean cancelled,
+ @JsonProperty("isError") boolean isError,
+ @JsonProperty("isCancelled") boolean isCancelled,
@JsonProperty("children") List<LinkWithMetadata> children,
@JsonProperty("submittedByTask") LinkWithMetadata submittedByTask,
@JsonProperty("blockingTask") LinkWithMetadata blockingTask,
@@ -102,8 +102,8 @@ public class TaskSummary implements HasId, Serializable {
this.endTimeUtc = endTimeUtc;
this.currentStatus = currentStatus;
this.result = result;
- this.error = error;
- this.cancelled = cancelled;
+ this.isError = isError;
+ this.isCancelled = isCancelled;
this.children = children;
this.blockingDetails = blockingDetails;
this.blockingTask = blockingTask;
@@ -168,26 +168,26 @@ public class TaskSummary implements HasId, Serializable {
return result;
}
- /** @deprecated since 0.7.0 use {@link #error} instead. */
+ /** @deprecated since 0.7.0 use {@link #isError} instead. */
@Deprecated
@JsonIgnore
public boolean getIsError() {
- return error;
+ return isError;
}
- /** @deprecated since 0.7.0 use {@link #cancelled} instead. */
+ /** @deprecated since 0.7.0 use {@link #isCancelled} instead. */
@Deprecated
@JsonIgnore
public boolean getIsCancelled() {
- return cancelled;
+ return isCancelled;
}
public boolean isError() {
- return error;
+ return isError;
}
public boolean isCancelled() {
- return cancelled;
+ return isCancelled;
}
public List<LinkWithMetadata> getChildren() {
@@ -223,8 +223,8 @@ public class TaskSummary implements HasId, Serializable {
if (this == o) return true;
if (!(o instanceof TaskSummary)) return false;
TaskSummary that = (TaskSummary) o;
- return error == that.error &&
- cancelled == that.cancelled &&
+ return isError == that.isError &&
+ isCancelled == that.isCancelled &&
Objects.equals(id, that.id) &&
Objects.equals(displayName, that.displayName) &&
Objects.equals(entityId, that.entityId) &&
@@ -247,7 +247,7 @@ public class TaskSummary implements HasId, Serializable {
@Override
public int hashCode() {
- return Objects.hash(id, displayName, entityId, entityDisplayName, description, tags, submitTimeUtc, startTimeUtc, endTimeUtc, currentStatus, result, error, cancelled, children, submittedByTask, blockingTask, blockingDetails, detailedStatus, streams, links);
+ return Objects.hash(id, displayName, entityId, entityDisplayName, description, tags, submitTimeUtc, startTimeUtc, endTimeUtc, currentStatus, result, isError, isCancelled, children, submittedByTask, blockingTask, blockingDetails, detailedStatus, streams, links);
}
@Override
@@ -264,8 +264,8 @@ public class TaskSummary implements HasId, Serializable {
", endTimeUtc=" + endTimeUtc +
", currentStatus='" + currentStatus + '\'' +
", result=" + result +
- ", error=" + error +
- ", cancelled=" + cancelled +
+ ", isError=" + isError +
+ ", isCancelled=" + isCancelled +
", children=" + children +
", submittedByTask=" + submittedByTask +
", blockingTask=" + blockingTask +
[2/5] brooklyn-server git commit: EntityDetail sets applicationId,
iconUrl, service state and service up
Posted by an...@apache.org.
EntityDetail sets applicationId, iconUrl, service state and service up
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/feab4002
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/feab4002
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/feab4002
Branch: refs/heads/master
Commit: feab40025dcb32ac6e41a4a4812b19988699ec56
Parents: 14bd340
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Feb 11 18:12:20 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 18:22:16 2016 +0000
----------------------------------------------------------------------
.../brooklyn/rest/domain/EntityDetail.java | 40 ++++++++++---
.../rest/resources/ApplicationResource.java | 60 +++++++++++---------
2 files changed, 66 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/feab4002/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityDetail.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityDetail.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityDetail.java
index 830c0b1..567c40b 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityDetail.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityDetail.java
@@ -18,27 +18,32 @@
*/
package org.apache.brooklyn.rest.domain;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.ImmutableList;
+import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
public class EntityDetail extends EntitySummary {
private static final long serialVersionUID = 100490507982229165L;
+ private final String applicationId;
private final String parentId;
@JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
private final List<EntitySummary> children;
private final List<String> groupIds;
private final List<Map<String, String>> members;
+ private final Boolean serviceUp;
+ private final Lifecycle serviceState;
+ private final String iconUrl;
public EntityDetail(
+ @JsonProperty("applicationId") String applicationId,
@JsonProperty("id") String id,
@JsonProperty("parentId") String parentId,
@JsonProperty("name") String name,
@@ -50,17 +55,25 @@ public class EntityDetail extends EntitySummary {
@JsonProperty("children") List<EntitySummary> children,
@JsonProperty("groupIds") List<String> groupIds,
@JsonProperty("members") List<Map<String, String>> members) {
- super(id, name, type, catalogItemId, null);
+ super(id, name, type, catalogItemId, Collections.<String, URI>emptyMap());
+ this.applicationId = applicationId;
+ this.iconUrl = iconUrl;
this.parentId = parentId;
this.children = (children == null) ? ImmutableList.<EntitySummary>of() : ImmutableList.copyOf(children);
this.groupIds = (groupIds == null) ? ImmutableList.<String>of() : ImmutableList.copyOf(groupIds);
- this.members = (members == null) ? ImmutableList.<Map<String,String>>of() : ImmutableList.copyOf(members);
+ this.members = (members == null) ? ImmutableList.<Map<String, String>>of() : ImmutableList.copyOf(members);
+ this.serviceState = serviceState;
+ this.serviceUp = serviceUp;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
+ public String getApplicationId() {
+ return applicationId;
+ }
+
public String getParentId() {
return parentId;
}
@@ -77,4 +90,15 @@ public class EntityDetail extends EntitySummary {
return members;
}
+ public Boolean getServiceUp() {
+ return serviceUp;
+ }
+
+ public Lifecycle getServiceState() {
+ return serviceState;
+ }
+
+ public String getIconUrl() {
+ return iconUrl;
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/feab4002/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java
index 97ed1d9..1dbf1a8 100644
--- a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java
+++ b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java
@@ -18,24 +18,11 @@
*/
package org.apache.brooklyn.rest.resources;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.Response.created;
-import static javax.ws.rs.core.Response.status;
-import static javax.ws.rs.core.Response.Status.ACCEPTED;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Throwables;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
@@ -83,11 +70,22 @@ import org.apache.brooklyn.util.text.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Throwables;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static javax.ws.rs.core.Response.Status.ACCEPTED;
+import static javax.ws.rs.core.Response.created;
+import static javax.ws.rs.core.Response.status;
@HaHotStateRequired
public class ApplicationResource extends AbstractBrooklynRestResource implements ApplicationApi {
@@ -134,9 +132,19 @@ public class ApplicationResource extends AbstractBrooklynRestResource implements
members.addAll(entitiesIdAndNameAsList(memberEntities));
}
- return new EntityDetail(entity.getId(), parentId, entity.getDisplayName(),
- entity.getEntityType().getName(), serviceUp, serviceState, iconUrl, entity.getCatalogItemId(),
- children, groupIds, members);
+ return new EntityDetail(
+ entity.getApplicationId(),
+ entity.getId(),
+ parentId,
+ entity.getDisplayName(),
+ entity.getEntityType().getName(),
+ serviceUp,
+ serviceState,
+ iconUrl,
+ entity.getCatalogItemId(),
+ children,
+ groupIds,
+ members);
}
private List<Map<String, String>> entitiesIdAndNameAsList(Collection<? extends Entity> entities) {
[5/5] brooklyn-server git commit: This closes #21
Posted by an...@apache.org.
This closes #21
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1a978154
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1a978154
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1a978154
Branch: refs/heads/master
Commit: 1a9781546705c06702dc50fa3a2ff766843cfbef
Parents: 5b01f8f d0a764e
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Feb 11 20:13:00 2016 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Thu Feb 11 20:13:00 2016 +0100
----------------------------------------------------------------------
.../brooklyn/rest/domain/EntityDetail.java | 40 ++++++++++---
.../brooklyn/rest/domain/TaskSummary.java | 34 +++++------
.../rest/resources/ApplicationResource.java | 60 +++++++++++---------
.../rest/resources/ApplicationResourceTest.java | 7 +++
4 files changed, 90 insertions(+), 51 deletions(-)
----------------------------------------------------------------------