You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/06/26 13:46:02 UTC
[1/4] git commit: Replaced Iterable<> return type with List<> in
public API to avoid deserialization errors.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 32cfe14c9 -> 439c086f1
Replaced Iterable<> return type with List<> in public API to avoid deserialization errors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cdec13c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cdec13c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cdec13c9
Branch: refs/heads/master
Commit: cdec13c94dd9cbe48ebb4dac985799da15b8feea
Parents: f3f2315
Author: Adrián Nieto <ad...@lcc.uma.es>
Authored: Wed Jun 25 15:37:42 2014 +0200
Committer: Adrián Nieto <ad...@lcc.uma.es>
Committed: Wed Jun 25 15:37:42 2014 +0200
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/api/ActivityApi.java | 5 ++++-
.../src/main/java/brooklyn/rest/api/EntityApi.java | 8 ++++----
.../src/main/java/brooklyn/rest/api/UsageApi.java | 6 ++++--
.../java/brooklyn/rest/resources/ActivityResource.java | 8 +++++---
.../java/brooklyn/rest/resources/EntityResource.java | 13 +++++++------
.../java/brooklyn/rest/resources/UsageResource.java | 4 ++--
6 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-api/src/main/java/brooklyn/rest/api/ActivityApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/api/ActivityApi.java b/usage/rest-api/src/main/java/brooklyn/rest/api/ActivityApi.java
index 7f6dcff..ca272ba 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/api/ActivityApi.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/api/ActivityApi.java
@@ -1,7 +1,10 @@
package brooklyn.rest.api;
+import java.util.List;
+
import brooklyn.rest.apidoc.Apidoc;
import brooklyn.rest.domain.TaskSummary;
+
import com.wordnik.swagger.core.ApiError;
import com.wordnik.swagger.core.ApiErrors;
import com.wordnik.swagger.core.ApiOperation;
@@ -33,7 +36,7 @@ public interface ActivityApi {
@ApiErrors(value = {
@ApiError(code = 404, reason = "Could not find task")
})
- public Iterable<TaskSummary> children(
+ public List<TaskSummary> children(
@ApiParam(value = "Task ID", required = true) @PathParam("task") String taskId);
@GET
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-api/src/main/java/brooklyn/rest/api/EntityApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/api/EntityApi.java b/usage/rest-api/src/main/java/brooklyn/rest/api/EntityApi.java
index 731df6a..f51d6c7 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/api/EntityApi.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/api/EntityApi.java
@@ -53,7 +53,7 @@ public interface EntityApi {
@ApiOperation(value = "Fetch details about a specific application entity's children",
responseClass = "brooklyn.rest.domain.EntitySummary")
@Path("/{entity}/entities")
- public Iterable<EntitySummary> getChildren(
+ public List<EntitySummary> getChildren(
@PathParam("application") final String application,
@PathParam("entity") final String entity
) ;
@@ -64,7 +64,7 @@ public interface EntityApi {
@ApiErrors(value = {
@ApiError(code = 404, reason = "Could not find application or entity")
})
- public Iterable<TaskSummary> listTasks(
+ public List<TaskSummary> listTasks(
@ApiParam(value = "Entity ID or name", required = true) @PathParam("application") String applicationId,
@ApiParam(value = "Application ID or name", required = true) @PathParam("entity") String entityId);
@@ -107,7 +107,7 @@ public interface EntityApi {
@ApiErrors(value = {
@ApiError(code = 404, reason = "Application or entity missing")
})
- public Iterable<EntitySummary> getDescendants(
+ public List<EntitySummary> getDescendants(
@ApiParam(value = "Application ID or name", required = true)
@PathParam("application") String application,
@ApiParam(value = "Entity ID or name", required = true)
@@ -141,7 +141,7 @@ public interface EntityApi {
@ApiErrors(value = {
@ApiError(code = 404, reason = "Application or entity missing")
})
- public Iterable<LocationSummary> getLocations(
+ public List<LocationSummary> getLocations(
@ApiParam(value = "Application ID or name", required = true)
@PathParam("application") String application,
@ApiParam(value = "Entity ID or name", required = true)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-api/src/main/java/brooklyn/rest/api/UsageApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/api/UsageApi.java b/usage/rest-api/src/main/java/brooklyn/rest/api/UsageApi.java
index a76f5c7..c856e4b 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/api/UsageApi.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/api/UsageApi.java
@@ -1,5 +1,7 @@
package brooklyn.rest.api;
+import java.util.List;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -33,7 +35,7 @@ public interface UsageApi {
responseClass = "brooklyn.rest.domain.UsageStatistics"
)
@ApiErrors(value = {})
- public Iterable<UsageStatistics> listApplicationsUsage(
+ public List<UsageStatistics> listApplicationsUsage(
@ApiParam(
name = "start",
value = "timestamp of start marker for usage reporting, in format UTC millis or yyyy-MM-dd'T'HH:mm:ssZ",
@@ -85,7 +87,7 @@ public interface UsageApi {
@ApiErrors(value = {
@ApiError(code = 404, reason = "Application not found")
})
- public Iterable<UsageStatistics> listMachinesUsage(
+ public List<UsageStatistics> listMachinesUsage(
@ApiParam(
name = "application",
value = "Application id",
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
index 656c6b6..587f874 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
@@ -1,6 +1,8 @@
package brooklyn.rest.resources;
import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
import brooklyn.entity.basic.BrooklynTaskTags;
import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream;
@@ -25,14 +27,14 @@ public class ActivityResource extends AbstractBrooklynRestResource implements Ac
}
@Override
- public Iterable<TaskSummary> children(String taskId) {
+ public List<TaskSummary> children(String taskId) {
Task<?> t = mgmt().getExecutionManager().getTask(taskId);
if (t==null)
throw WebResourceUtils.notFound("Cannot find task '%s'", taskId);
if (!(t instanceof HasTaskChildren))
return Collections.emptyList();
- return Collections2.transform(Lists.newArrayList(((HasTaskChildren)t).getChildren()),
- TaskTransformer.FROM_TASK);
+ return new LinkedList<>(Collections2.transform(Lists.newArrayList(((HasTaskChildren)t).getChildren()),
+ TaskTransformer.FROM_TASK));
}
public String stream(String taskId, String streamId) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
index 1ff9f1b..edeeb09 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
@@ -5,6 +5,7 @@ import static javax.ws.rs.core.Response.Status.ACCEPTED;
import java.net.URI;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -46,15 +47,15 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti
}
@Override
- public Iterable<EntitySummary> getChildren( final String application, final String entity) {
+ public List<EntitySummary> getChildren( final String application, final String entity) {
return EntityTransformer.entitySummaries(brooklyn().getEntity(application, entity).getChildren());
}
@Override
- public Iterable<TaskSummary> listTasks(String applicationId, String entityId) {
+ public List<TaskSummary> listTasks(String applicationId, String entityId) {
Entity entity = brooklyn().getEntity(applicationId, entityId);
Set<Task<?>> tasks = BrooklynTaskTags.getTasksInEntityContext(mgmt().getExecutionManager(), entity);
- return Collections2.transform(tasks, TaskTransformer.FROM_TASK);
+ return new LinkedList<>(Collections2.transform(tasks, TaskTransformer.FROM_TASK));
}
@Override
@@ -95,7 +96,7 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti
}
@Override
- public Iterable<EntitySummary> getDescendants(String application, String entity, String typeRegex) {
+ public List<EntitySummary> getDescendants(String application, String entity, String typeRegex) {
return EntityTransformer.entitySummaries(brooklyn().descendantsOfType(application, entity, typeRegex));
}
@@ -106,8 +107,8 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti
}
@Override
- public Iterable<LocationSummary> getLocations(String application, String entity) {
- Collection<LocationSummary> result = Lists.newArrayList();
+ public List<LocationSummary> getLocations(String application, String entity) {
+ List<LocationSummary> result = Lists.newArrayList();
EntityLocal e = brooklyn().getEntity(application, entity);
for (Location l: e.getLocations()) {
result.add(LocationTransformer.newInstance(mgmt(), l, LocationDetailLevel.NONE));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cdec13c9/usage/rest-server/src/main/java/brooklyn/rest/resources/UsageResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/UsageResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/UsageResource.java
index a9f9c98..d6fa0fa 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/UsageResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/UsageResource.java
@@ -47,7 +47,7 @@ public class UsageResource extends AbstractBrooklynRestResource implements Usage
};
@Override
- public Iterable<UsageStatistics> listApplicationsUsage(@Nullable String start, @Nullable String end) {
+ public List<UsageStatistics> listApplicationsUsage(@Nullable String start, @Nullable String end) {
log.debug("REST call to get application usage for all applications: dates {} -> {}", new Object[] {start, end});
List<UsageStatistics> response = Lists.newArrayList();
@@ -127,7 +127,7 @@ public class UsageResource extends AbstractBrooklynRestResource implements Usage
}
@Override
- public Iterable<UsageStatistics> listMachinesUsage(final String application, final String start, final String end) {
+ public List<UsageStatistics> listMachinesUsage(final String application, final String start, final String end) {
log.debug("REST call to get machine usage for application {}: dates {} -> {}", new Object[] {application, start, end});
final Date startDate = parseDate(start, new Date(0));
[2/4] git commit: Removed Java7 from
cdec13c94dd9cbe48ebb4dac985799da15b8feea
Posted by he...@apache.org.
Removed Java7 from cdec13c94dd9cbe48ebb4dac985799da15b8feea
Fixed a small mistake related with Java7 using with Java6 build target.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/47292d9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/47292d9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/47292d9a
Branch: refs/heads/master
Commit: 47292d9ac42d59f196c2fd255d9743c387576d67
Parents: cdec13c
Author: Adrián Nieto <ad...@lcc.uma.es>
Authored: Thu Jun 26 13:30:34 2014 +0200
Committer: Adrián Nieto <ad...@lcc.uma.es>
Committed: Thu Jun 26 13:30:34 2014 +0200
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/resources/ActivityResource.java | 2 +-
.../src/main/java/brooklyn/rest/resources/EntityResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47292d9a/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
index 587f874..ea67632 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ActivityResource.java
@@ -33,7 +33,7 @@ public class ActivityResource extends AbstractBrooklynRestResource implements Ac
throw WebResourceUtils.notFound("Cannot find task '%s'", taskId);
if (!(t instanceof HasTaskChildren))
return Collections.emptyList();
- return new LinkedList<>(Collections2.transform(Lists.newArrayList(((HasTaskChildren)t).getChildren()),
+ return new LinkedList<TaskSummary>(Collections2.transform(Lists.newArrayList(((HasTaskChildren)t).getChildren()),
TaskTransformer.FROM_TASK));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47292d9a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
index edeeb09..c3ddb46 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityResource.java
@@ -55,7 +55,7 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti
public List<TaskSummary> listTasks(String applicationId, String entityId) {
Entity entity = brooklyn().getEntity(applicationId, entityId);
Set<Task<?>> tasks = BrooklynTaskTags.getTasksInEntityContext(mgmt().getExecutionManager(), entity);
- return new LinkedList<>(Collections2.transform(tasks, TaskTransformer.FROM_TASK));
+ return new LinkedList<TaskSummary>(Collections2.transform(tasks, TaskTransformer.FROM_TASK));
}
@Override
[4/4] git commit: This closes #18
Posted by he...@apache.org.
This closes #18
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/439c086f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/439c086f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/439c086f
Branch: refs/heads/master
Commit: 439c086f194debb7cb62ab542de74575d643ff4a
Parents: 32cfe14 afc99bc
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jun 26 12:45:04 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jun 26 12:45:04 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/api/ActivityApi.java | 5 ++++-
.../src/main/java/brooklyn/rest/api/EntityApi.java | 8 ++++----
.../src/main/java/brooklyn/rest/api/UsageApi.java | 6 ++++--
.../java/brooklyn/rest/resources/ActivityResource.java | 8 +++++---
.../java/brooklyn/rest/resources/EntityResource.java | 13 +++++++------
.../java/brooklyn/rest/resources/UsageResource.java | 4 ++--
6 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: Merge pull request #1 from adriannieto/master
Posted by he...@apache.org.
Merge pull request #1 from adriannieto/master
Removed Java7 from cdec13c94dd9cbe48ebb4dac985799da15b8feea
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/afc99bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/afc99bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/afc99bc0
Branch: refs/heads/master
Commit: afc99bc0915669a21f3f9a481e0c094c0f160c5e
Parents: cdec13c 47292d9
Author: Adrián Nieto <ad...@users.noreply.github.com>
Authored: Thu Jun 26 13:33:14 2014 +0200
Committer: Adrián Nieto <ad...@users.noreply.github.com>
Committed: Thu Jun 26 13:33:14 2014 +0200
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/resources/ActivityResource.java | 2 +-
.../src/main/java/brooklyn/rest/resources/EntityResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------