Fix indents in rest-server
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bfac921f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bfac921f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bfac921f Branch: refs/heads/master Commit: bfac921f7a4c211e5ff5ce48e262843095a47493 Parents: f7aa762 Author: Aled Sage <[email protected]> Authored: Fri Jan 9 01:11:14 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Wed Jan 14 20:01:07 2015 +0000 ---------------------------------------------------------------------- .../rest/resources/ActivityResource.java | 53 +- .../rest/resources/EntityConfigResource.java | 142 +-- .../brooklyn/rest/resources/EntityResource.java | 216 ++--- .../rest/resources/PolicyConfigResource.java | 121 ++- .../brooklyn/rest/resources/PolicyResource.java | 5 +- .../brooklyn/rest/resources/ScriptResource.java | 5 +- .../rest/resources/VersionResource.java | 9 +- .../provider/AbstractSecurityProvider.java | 2 - .../provider/AnyoneSecurityProvider.java | 1 - .../provider/BlackholeSecurityProvider.java | 1 - ...nUserWithRandomPasswordSecurityProvider.java | 1 - .../provider/DelegatingSecurityProvider.java | 1 - .../provider/ExplicitUsersSecurityProvider.java | 1 - .../security/provider/LdapSecurityProvider.java | 1 - .../rest/transform/CatalogTransformer.java | 1 - .../rest/transform/EntityTransformer.java | 1 - .../rest/transform/LocationTransformer.java | 1 - .../rest/transform/PolicyTransformer.java | 1 - .../rest/transform/TaskTransformer.java | 1 - .../rest/util/BrooklynRestResourceUtils.java | 1 - .../rest/util/DefaultExceptionMapper.java | 1 - .../brooklyn/rest/util/EntityLocationUtils.java | 1 - .../brooklyn/rest/util/FormMapProvider.java | 1 - .../brooklyn/rest/util/WebResourceUtils.java | 1 - .../util/json/BrooklynJacksonJsonProvider.java | 1 - .../json/ConfigurableSerializerProvider.java | 3 +- .../ErrorAndToStringUnknownTypeSerializer.java | 1 - .../rest/util/json/MultimapSerializer.java | 1 - ...StrictPreferringFieldsVisibilityChecker.java | 2 +- .../brooklyn/rest/domain/ApplicationTest.java | 87 +- .../rest/domain/LocationSummaryTest.java | 35 +- .../brooklyn/rest/domain/SensorSummaryTest.java | 108 +-- .../rest/resources/ApplicationResourceTest.java | 877 +++++++++---------- .../rest/resources/CatalogResourceTest.java | 420 +++++---- .../rest/resources/LocationResourceTest.java | 103 ++- .../rest/resources/VersionResourceTest.java | 33 +- 36 files changed, 1099 insertions(+), 1141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/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 9e68b25..362dd09 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 @@ -36,33 +36,32 @@ import com.google.common.collect.Lists; public class ActivityResource extends AbstractBrooklynRestResource implements ActivityApi { - @Override - public TaskSummary get(String taskId) { - Task<?> t = mgmt().getExecutionManager().getTask(taskId); - if (t==null) - throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); - return TaskTransformer.FROM_TASK.apply(t); - } + @Override + public TaskSummary get(String taskId) { + Task<?> t = mgmt().getExecutionManager().getTask(taskId); + if (t == null) + throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); + return TaskTransformer.FROM_TASK.apply(t); + } - @Override - 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 new LinkedList<TaskSummary>(Collections2.transform(Lists.newArrayList(((HasTaskChildren)t).getChildren()), - TaskTransformer.FROM_TASK)); - } + @Override + 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 new LinkedList<TaskSummary>(Collections2.transform(Lists.newArrayList(((HasTaskChildren) t).getChildren()), + TaskTransformer.FROM_TASK)); + } - public String stream(String taskId, String streamId) { - Task<?> t = mgmt().getExecutionManager().getTask(taskId); - if (t==null) - throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); - WrappedStream stream = BrooklynTaskTags.stream(t, streamId); - if (stream==null) - throw WebResourceUtils.notFound("Cannot find stream '%s' in task '%s'", streamId, taskId); - return stream.streamContents.get(); - } - + public String stream(String taskId, String streamId) { + Task<?> t = mgmt().getExecutionManager().getTask(taskId); + if (t == null) + throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); + WrappedStream stream = BrooklynTaskTags.stream(t, streamId); + if (stream == null) + throw WebResourceUtils.notFound("Cannot find stream '%s' in task '%s'", streamId, taskId); + return stream.streamContents.get(); + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java index efcd248..8af5ab7 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EntityConfigResource.java @@ -50,19 +50,19 @@ public class EntityConfigResource extends AbstractBrooklynRestResource implement private static final Logger LOG = LoggerFactory.getLogger(EntityConfigResource.class); - @Override - public List<EntityConfigSummary> list(final String application, final String entityToken) { - final EntityLocal entity = brooklyn().getEntity(application, entityToken); - - return Lists.newArrayList(transform( - entity.getEntityType().getConfigKeys(), - new Function<ConfigKey<?>, EntityConfigSummary>() { - @Override - public EntityConfigSummary apply(ConfigKey<?> config) { - return EntityTransformer.entityConfigSummary(entity, config); - } - })); - } + @Override + public List<EntityConfigSummary> list(final String application, final String entityToken) { + final EntityLocal entity = brooklyn().getEntity(application, entityToken); + + return Lists.newArrayList(transform( + entity.getEntityType().getConfigKeys(), + new Function<ConfigKey<?>, EntityConfigSummary>() { + @Override + public EntityConfigSummary apply(ConfigKey<?> config) { + return EntityTransformer.entityConfigSummary(entity, config); + } + })); + } // TODO support parameters ?show=value,summary&name=xxx &format={string,json,xml} // (and in sensors class) @@ -82,15 +82,15 @@ public class EntityConfigResource extends AbstractBrooklynRestResource implement return result; } - @Override - public Object get(String application, String entityToken, String configKeyName, Boolean raw) { - return get(true, application, entityToken, configKeyName, raw); - } - - @Override - public String getPlain(String application, String entityToken, String configKeyName, Boolean raw) { - return Strings.toString(get(false, application, entityToken, configKeyName, raw)); - } + @Override + public Object get(String application, String entityToken, String configKeyName, Boolean raw) { + return get(true, application, entityToken, configKeyName, raw); + } + + @Override + public String getPlain(String application, String entityToken, String configKeyName, Boolean raw) { + return Strings.toString(get(false, application, entityToken, configKeyName, raw)); + } public Object get(boolean preferJson, String application, String entityToken, String configKeyName, Boolean raw) { EntityLocal entity = brooklyn().getEntity(application, entityToken); @@ -102,54 +102,54 @@ public class EntityConfigResource extends AbstractBrooklynRestResource implement return getValueForDisplay(value, preferJson, true); } - private ConfigKey<?> findConfig(EntityLocal entity, String configKeyName) { - ConfigKey<?> ck = entity.getEntityType().getConfigKey(configKeyName); - if (ck==null) ck = new BasicConfigKey<Object>(Object.class, configKeyName); - return ck; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void setFromMap(String application, String entityToken, Boolean recurse, Map newValues) { - final EntityLocal entity = brooklyn().getEntity(application, entityToken); - if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { - throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", - Entitlements.getEntitlementContext().user(), entity); - } - - if (LOG.isDebugEnabled()) - LOG.debug("REST user "+Entitlements.getEntitlementContext()+" setting configs "+newValues); - for (Object entry: newValues.entrySet()) { - String configName = Strings.toString(((Map.Entry)entry).getKey()); - Object newValue = ((Map.Entry)entry).getValue(); - - ConfigKey ck = findConfig(entity, configName); - ((EntityInternal) entity).setConfig(ck, TypeCoercions.coerce(newValue, ck.getTypeToken())); - if (Boolean.TRUE.equals(recurse)) { - for (Entity e2: Entities.descendants(entity, Predicates.alwaysTrue(), false)) { - ((EntityInternal) e2).setConfig(ck, newValue); - } - } - } - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void set(String application, String entityToken, String configName, Boolean recurse, Object newValue) { - final EntityLocal entity = brooklyn().getEntity(application, entityToken); - if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { - throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", - Entitlements.getEntitlementContext().user(), entity); - } - - ConfigKey ck = findConfig(entity, configName); - LOG.debug("REST setting config "+configName+" on "+entity+" to "+newValue); - ((EntityInternal) entity).setConfig(ck, TypeCoercions.coerce(newValue, ck.getTypeToken())); - if (Boolean.TRUE.equals(recurse)) { - for (Entity e2: Entities.descendants(entity, Predicates.alwaysTrue(), false)) { - ((EntityInternal) e2).setConfig(ck, newValue); - } - } - } + private ConfigKey<?> findConfig(EntityLocal entity, String configKeyName) { + ConfigKey<?> ck = entity.getEntityType().getConfigKey(configKeyName); + if (ck == null) + ck = new BasicConfigKey<Object>(Object.class, configKeyName); + return ck; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override + public void setFromMap(String application, String entityToken, Boolean recurse, Map newValues) { + final EntityLocal entity = brooklyn().getEntity(application, entityToken); + if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { + throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", + Entitlements.getEntitlementContext().user(), entity); + } + if (LOG.isDebugEnabled()) + LOG.debug("REST user " + Entitlements.getEntitlementContext() + " setting configs " + newValues); + for (Object entry : newValues.entrySet()) { + String configName = Strings.toString(((Map.Entry) entry).getKey()); + Object newValue = ((Map.Entry) entry).getValue(); + + ConfigKey ck = findConfig(entity, configName); + ((EntityInternal) entity).setConfig(ck, TypeCoercions.coerce(newValue, ck.getTypeToken())); + if (Boolean.TRUE.equals(recurse)) { + for (Entity e2 : Entities.descendants(entity, Predicates.alwaysTrue(), false)) { + ((EntityInternal) e2).setConfig(ck, newValue); + } + } + } + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override + public void set(String application, String entityToken, String configName, Boolean recurse, Object newValue) { + final EntityLocal entity = brooklyn().getEntity(application, entityToken); + if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { + throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", + Entitlements.getEntitlementContext().user(), entity); + } + + ConfigKey ck = findConfig(entity, configName); + LOG.debug("REST setting config " + configName + " on " + entity + " to " + newValue); + ((EntityInternal) entity).setConfig(ck, TypeCoercions.coerce(newValue, ck.getTypeToken())); + if (Boolean.TRUE.equals(recurse)) { + for (Entity e2 : Entities.descendants(entity, Predicates.alwaysTrue(), false)) { + ((EntityInternal) e2).setConfig(ck, newValue); + } + } + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/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 caa26c6..239139f 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 @@ -75,57 +75,57 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti @Context private UriInfo uriInfo; - @Override - public List<EntitySummary> list(final String application) { - return FluentIterable - .from(brooklyn().getApplication(application).getChildren()) - .filter(EntitlementPredicates.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY)) - .transform(EntityTransformer.FROM_ENTITY) - .toList(); - } - - @Override - public EntitySummary get(String application, String entityName) { - Entity entity = brooklyn().getEntity(application, entityName); - if (Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY, entity)) { - return EntityTransformer.entitySummary(entity); - } - throw WebResourceUtils.unauthorized("User '%s' is not authorized to get entity '%s'", - Entitlements.getEntitlementContext().user(), entity); - } - - @Override - public List<EntitySummary> getChildren(final String application, final String entity) { - return FluentIterable - .from(brooklyn().getEntity(application, entity).getChildren()) - .filter(EntitlementPredicates.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY)) - .transform(EntityTransformer.FROM_ENTITY) - .toList(); - } - - @Override - public List<EntitySummary> getChildrenOld(String application, String entity) { + @Override + public List<EntitySummary> list(final String application) { + return FluentIterable + .from(brooklyn().getApplication(application).getChildren()) + .filter(EntitlementPredicates.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY)) + .transform(EntityTransformer.FROM_ENTITY) + .toList(); + } + + @Override + public EntitySummary get(String application, String entityName) { + Entity entity = brooklyn().getEntity(application, entityName); + if (Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY, entity)) { + return EntityTransformer.entitySummary(entity); + } + throw WebResourceUtils.unauthorized("User '%s' is not authorized to get entity '%s'", + Entitlements.getEntitlementContext().user(), entity); + } + + @Override + public List<EntitySummary> getChildren(final String application, final String entity) { + return FluentIterable + .from(brooklyn().getEntity(application, entity).getChildren()) + .filter(EntitlementPredicates.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_ENTITY)) + .transform(EntityTransformer.FROM_ENTITY) + .toList(); + } + + @Override + public List<EntitySummary> getChildrenOld(String application, String entity) { log.warn("Using deprecated call to /entities when /children should be used"); return getChildren(application, entity); - } - + } + @Override public Response addChildren(String applicationToken, String entityToken, Boolean start, String timeoutS, String yaml) { final EntityLocal parent = brooklyn().getEntity(applicationToken, entityToken); if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, parent)) { throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", - Entitlements.getEntitlementContext().user(), entityToken); + Entitlements.getEntitlementContext().user(), entityToken); } CreationResult<List<Entity>, List<String>> added = EntityManagementUtils.addChildren(parent, yaml, start) - .blockUntilComplete(timeoutS==null ? Duration.millis(20) : Duration.of(timeoutS)); + .blockUntilComplete(timeoutS==null ? Duration.millis(20) : Duration.of(timeoutS)); ResponseBuilder response; if (added.get().size()==1) { Entity child = Iterables.getOnlyElement(added.get()); URI ref = uriInfo.getBaseUriBuilder() - .path(EntityApi.class) - .path(EntityApi.class, "get") - .build(child.getApplicationId(), child.getId()); + .path(EntityApi.class) + .path(EntityApi.class, "get") + .build(child.getApplicationId(), child.getId()); response = created(ref); } else { response = Response.status(Status.CREATED); @@ -133,48 +133,48 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti return response.entity(TaskTransformer.taskSummary(added.task())).build(); } - @Override - 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<TaskSummary>(Collections2.transform(tasks, TaskTransformer.FROM_TASK)); - } - - @Override - public TaskSummary getTask(final String application, final String entityToken, String taskId) { - // TODO deprecate in favour of ActivityApi.get ? - Task<?> t = mgmt().getExecutionManager().getTask(taskId); - if (t==null) - throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); - return TaskTransformer.FROM_TASK.apply(t); - } - - @SuppressWarnings("unchecked") - @Override - public List<Object> listTags(String applicationId, String entityId) { - Entity entity = brooklyn().getEntity(applicationId, entityId); - return (List<Object>) getValueForDisplay(MutableList.copyOf(entity.tags().getTags()), true, true); - } - - @Override - public Response getIcon(String applicationId, String entityId) { - EntityLocal entity = brooklyn().getEntity(applicationId, entityId); - String url = entity.getIconUrl(); - if (url==null) - return Response.status(Status.NO_CONTENT).build(); - - if (brooklyn().isUrlServerSideAndSafe(url)) { - // classpath URL's we will serve IF they end with a recognised image format; - // paths (ie non-protocol) and - // NB, for security, file URL's are NOT served - MediaType mime = WebResourceUtils.getImageMediaTypeFromExtension(Files.getFileExtension(url)); - Object content = ResourceUtils.create(brooklyn().getCatalog().getRootClassLoader()).getResourceFromUrl(url); - return Response.ok(content, mime).build(); - } - - // for anything else we do a redirect (e.g. http / https; perhaps ftp) - return Response.temporaryRedirect(URI.create(url)).build(); - } + @Override + 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<TaskSummary>(Collections2.transform(tasks, TaskTransformer.FROM_TASK)); + } + + @Override + public TaskSummary getTask(final String application, final String entityToken, String taskId) { + // TODO deprecate in favour of ActivityApi.get ? + Task<?> t = mgmt().getExecutionManager().getTask(taskId); + if (t == null) + throw WebResourceUtils.notFound("Cannot find task '%s'", taskId); + return TaskTransformer.FROM_TASK.apply(t); + } + + @SuppressWarnings("unchecked") + @Override + public List<Object> listTags(String applicationId, String entityId) { + Entity entity = brooklyn().getEntity(applicationId, entityId); + return (List<Object>) getValueForDisplay(MutableList.copyOf(entity.tags().getTags()), true, true); + } + + @Override + public Response getIcon(String applicationId, String entityId) { + EntityLocal entity = brooklyn().getEntity(applicationId, entityId); + String url = entity.getIconUrl(); + if (url == null) + return Response.status(Status.NO_CONTENT).build(); + + if (brooklyn().isUrlServerSideAndSafe(url)) { + // classpath URL's we will serve IF they end with a recognised image format; + // paths (ie non-protocol) and + // NB, for security, file URL's are NOT served + MediaType mime = WebResourceUtils.getImageMediaTypeFromExtension(Files.getFileExtension(url)); + Object content = ResourceUtils.create(brooklyn().getCatalog().getRootClassLoader()).getResourceFromUrl(url); + return Response.ok(content, mime).build(); + } + + // for anything else we do a redirect (e.g. http / https; perhaps ftp) + return Response.temporaryRedirect(URI.create(url)).build(); + } @Override public Response rename(String application, String entity, String newName) { @@ -191,33 +191,33 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti return status(ACCEPTED).entity(summary).build(); } - @Override - public List<EntitySummary> getDescendants(String application, String entity, String typeRegex) { - return EntityTransformer.entitySummaries(brooklyn().descendantsOfType(application, entity, typeRegex)); - } - - @Override - public Map<String, Object> getDescendantsSensor(String application, String entity, String sensor, String typeRegex) { - Iterable<Entity> descs = brooklyn().descendantsOfType(application, entity, typeRegex); - return ApplicationResource.getSensorMap(sensor, descs); - } - - @Override - 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)); - } - return result; - } - - @Override - public String getSpec(String applicationToken, String entityToken) { - EntityLocal entity = brooklyn().getEntity(applicationToken, entityToken); - NamedStringTag spec = BrooklynTags.findFirst(BrooklynTags.YAML_SPEC_KIND, entity.tags().getTags()); - if (spec==null) return null; - return (String) getValueForDisplay(spec.getContents(), true, true); - } - + @Override + public List<EntitySummary> getDescendants(String application, String entity, String typeRegex) { + return EntityTransformer.entitySummaries(brooklyn().descendantsOfType(application, entity, typeRegex)); + } + + @Override + public Map<String, Object> getDescendantsSensor(String application, String entity, String sensor, String typeRegex) { + Iterable<Entity> descs = brooklyn().descendantsOfType(application, entity, typeRegex); + return ApplicationResource.getSensorMap(sensor, descs); + } + + @Override + 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)); + } + return result; + } + + @Override + public String getSpec(String applicationToken, String entityToken) { + EntityLocal entity = brooklyn().getEntity(applicationToken, entityToken); + NamedStringTag spec = BrooklynTags.findFirst(BrooklynTags.YAML_SPEC_KIND, entity.tags().getTags()); + if (spec == null) + return null; + return (String) getValueForDisplay(spec.getContents(), true, true); + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java index 4136daf..5c2a1ba 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyConfigResource.java @@ -40,68 +40,67 @@ import com.google.common.collect.Maps; public class PolicyConfigResource extends AbstractBrooklynRestResource implements PolicyConfigApi { - @Override - public List<PolicyConfigSummary> list( - final String application, final String entityToken, final String policyToken - ) { - EntityLocal entity = brooklyn().getEntity(application, entityToken); - Policy policy = brooklyn().getPolicy(entity, policyToken); - - List<PolicyConfigSummary> result = Lists.newArrayList(); - for (ConfigKey<?> key : policy.getPolicyType().getConfigKeys()) { - result.add(PolicyTransformer.policyConfigSummary(brooklyn(), entity, policy, key)); + @Override + public List<PolicyConfigSummary> list( + final String application, final String entityToken, final String policyToken) { + EntityLocal entity = brooklyn().getEntity(application, entityToken); + Policy policy = brooklyn().getPolicy(entity, policyToken); + + List<PolicyConfigSummary> result = Lists.newArrayList(); + for (ConfigKey<?> key : policy.getPolicyType().getConfigKeys()) { + result.add(PolicyTransformer.policyConfigSummary(brooklyn(), entity, policy, key)); + } + return result; + } + + // TODO support parameters ?show=value,summary&name=xxx &format={string,json,xml} + // (and in sensors class) + @Override + public Map<String, Object> batchConfigRead(String application, String entityToken, String policyToken) { + // TODO: add test + Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); + Map<ConfigKey<?>, Object> source = policy.getAllConfig(); + Map<String, Object> result = Maps.newLinkedHashMap(); + for (Map.Entry<ConfigKey<?>, Object> ek : source.entrySet()) { + result.put(ek.getKey().getName(), getStringValueForDisplay(brooklyn(), policy, ek.getValue())); + } + return result; } - return result; - } - - // TODO support parameters ?show=value,summary&name=xxx &format={string,json,xml} - // (and in sensors class) - @Override - public Map<String, Object> batchConfigRead(String application, String entityToken, String policyToken) { - // TODO: add test - Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); - Map<ConfigKey<?>, Object> source = policy.getAllConfig(); - Map<String, Object> result = Maps.newLinkedHashMap(); - for (Map.Entry<ConfigKey<?>, Object> ek: source.entrySet()) { - result.put(ek.getKey().getName(), getStringValueForDisplay(brooklyn(), policy, ek.getValue())); + + @Override + public String get(String application, String entityToken, String policyToken, String configKeyName) { + Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); + ConfigKey<?> ck = policy.getPolicyType().getConfigKey(configKeyName); + if (ck == null) throw WebResourceUtils.notFound("Cannot find config key '%s' in policy '%s' of entity '%s'", configKeyName, policy, entityToken); + + return getStringValueForDisplay(brooklyn(), policy, policy.getConfig(ck)); + } + + @Override + @Deprecated + public Response set(String application, String entityToken, String policyToken, String configKeyName, String value) { + return set(application, entityToken, policyToken, configKeyName, (Object) value); } - return result; - } - - @Override - public String get(String application, String entityToken, String policyToken, String configKeyName) { - Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); - ConfigKey<?> ck = policy.getPolicyType().getConfigKey(configKeyName); - if (ck == null) throw WebResourceUtils.notFound("Cannot find config key '%s' in policy '%s' of entity '%s'", configKeyName, policy, entityToken); - - return getStringValueForDisplay(brooklyn(), policy, policy.getConfig(ck)); - } - - @Override @Deprecated - public Response set(String application, String entityToken, String policyToken, String configKeyName, String value) { - return set(application, entityToken, policyToken, configKeyName, (Object)value); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public Response set(String application, String entityToken, String policyToken, String configKeyName, Object value) { - Entity entity = brooklyn().getEntity(application, entityToken); - if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { - throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", - Entitlements.getEntitlementContext().user(), entity); - } - - Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); - ConfigKey<?> ck = policy.getPolicyType().getConfigKey(configKeyName); - if (ck == null) throw WebResourceUtils.notFound("Cannot find config key '%s' in policy '%s' of entity '%s'", configKeyName, policy, entityToken); - - policy.setConfig((ConfigKey) ck, TypeCoercions.coerce(value, ck.getTypeToken())); - - return Response.status(Response.Status.OK).build(); - } - - public static String getStringValueForDisplay(BrooklynRestResourceUtils utils, Policy policy, Object value) { - return utils.getStringValueForDisplay(value); - } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public Response set(String application, String entityToken, String policyToken, String configKeyName, Object value) { + Entity entity = brooklyn().getEntity(application, entityToken); + if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_ENTITY, entity)) { + throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify entity '%s'", + Entitlements.getEntitlementContext().user(), entity); + } + + Policy policy = brooklyn().getPolicy(application, entityToken, policyToken); + ConfigKey<?> ck = policy.getPolicyType().getConfigKey(configKeyName); + if (ck == null) throw WebResourceUtils.notFound("Cannot find config key '%s' in policy '%s' of entity '%s'", configKeyName, policy, entityToken); + + policy.setConfig((ConfigKey) ck, TypeCoercions.coerce(value, ck.getTypeToken())); + + return Response.status(Response.Status.OK).build(); + } + + public static String getStringValueForDisplay(BrooklynRestResourceUtils utils, Policy policy, Object value) { + return utils.getStringValueForDisplay(value); + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java index 38d577c..06e283d 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/PolicyResource.java @@ -74,12 +74,11 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli return result; } + // TODO would like to make 'config' arg optional but jersey complains if we do @SuppressWarnings("unchecked") @Override public PolicySummary addPolicy( String application,String entityToken, String policyTypeName, - // TODO would like to make this optional but jersey complains if we do - Map<String, String> config - ) { + Map<String, String> config) { EntityLocal entity = brooklyn().getEntity(application, entityToken); Class<? extends Policy> policyType; try { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/resources/ScriptResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ScriptResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ScriptResource.java index 917d7f6..84909da 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ScriptResource.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ScriptResource.java @@ -92,8 +92,7 @@ public class ScriptResource extends AbstractBrooklynRestResource implements Scri // call toString on the result, in case it is not serializable return new ScriptExecutionSummary( value!=null ? value.toString() : null, - problem!=null ? problem.toString() : null, - stdout.toString(), stderr.toString()); + problem!=null ? problem.toString() : null, + stdout.toString(), stderr.toString()); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/resources/VersionResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/VersionResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/VersionResource.java index ec90b3b..44e26ab 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/resources/VersionResource.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/VersionResource.java @@ -25,9 +25,8 @@ import brooklyn.rest.api.VersionApi; @Deprecated public class VersionResource extends AbstractBrooklynRestResource implements VersionApi { - @Override - public String getVersion() { - return BrooklynVersion.get(); - } - + @Override + public String getVersion() { + return BrooklynVersion.get(); + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AbstractSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AbstractSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AbstractSecurityProvider.java index 6fd2f30..6ff5007 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AbstractSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AbstractSecurityProvider.java @@ -53,6 +53,4 @@ public abstract class AbstractSecurityProvider implements SecurityProvider { protected String getAuthenticationKey() { return getClass().getName() + ".AUTHENTICATED"; } - - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AnyoneSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AnyoneSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AnyoneSecurityProvider.java index 9719584..13d520e 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AnyoneSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/AnyoneSecurityProvider.java @@ -37,5 +37,4 @@ public class AnyoneSecurityProvider implements SecurityProvider { public boolean logout(HttpSession session) { return true; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BlackholeSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BlackholeSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BlackholeSecurityProvider.java index 0ad2086..4add0eb 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BlackholeSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BlackholeSecurityProvider.java @@ -37,5 +37,4 @@ public class BlackholeSecurityProvider implements SecurityProvider { public boolean logout(HttpSession session) { return true; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java index 90b7a1a..9cf63ca 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java @@ -65,5 +65,4 @@ public class BrooklynUserWithRandomPasswordSecurityProvider extends AbstractSecu return false; } } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/DelegatingSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/DelegatingSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/DelegatingSecurityProvider.java index 7b49bdd..e7669ba 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/DelegatingSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/DelegatingSecurityProvider.java @@ -145,5 +145,4 @@ public class DelegatingSecurityProvider implements SecurityProvider { private String getModificationCountKey() { return getClass().getName() + ".ModCount"; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java index 7e5119f..fc5e3c6 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java @@ -98,5 +98,4 @@ public class ExplicitUsersSecurityProvider extends AbstractSecurityProvider impl return false; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/security/provider/LdapSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/LdapSecurityProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/LdapSecurityProvider.java index bc905fb..a9fa453 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/security/provider/LdapSecurityProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/security/provider/LdapSecurityProvider.java @@ -98,5 +98,4 @@ public class LdapSecurityProvider extends AbstractSecurityProvider implements Se throw Exceptions.propagate(new ClassNotFoundException("Unable to load LDAP classes ("+LDAP_CONTEXT_FACTORY+") required for Brooklyn LDAP security provider")); } } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/transform/CatalogTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/CatalogTransformer.java index 1bcdf00..261dfb9 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/CatalogTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/CatalogTransformer.java @@ -100,5 +100,4 @@ public class CatalogTransformer { return "/v1/catalog/icon/"+item.getSymbolicName() + "/" + item.getVersion(); return iconUrl; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/transform/EntityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/EntityTransformer.java index 3f5b9a7..92e2165 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/EntityTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/EntityTransformer.java @@ -152,5 +152,4 @@ public class EntityTransformer { Double priority = catalogConfig==null ? null : catalogConfig.priority(); return entityConfigSummary(config, label, priority, null); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java index fdf837a..a77e386 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/LocationTransformer.java @@ -181,5 +181,4 @@ public class LocationTransformer { .addIfNotNull("spec", specId!=null ? URI.create("/v1/locations/"+specId) : null) .asUnmodifiable() ); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/transform/PolicyTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/PolicyTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/PolicyTransformer.java index 0d9d9f0..84baf3b 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/PolicyTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/PolicyTransformer.java @@ -82,5 +82,4 @@ public class PolicyTransformer { config.isReconfigurable(), links); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/transform/TaskTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/transform/TaskTransformer.java b/usage/rest-server/src/main/java/brooklyn/rest/transform/TaskTransformer.java index bf2cb71..b36385f 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/transform/TaskTransformer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/transform/TaskTransformer.java @@ -144,5 +144,4 @@ public class TaskTransformer { } return new LinkWithMetadata("/v1/activities/"+t.getId(), data); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java index c9ba5f4..5ddf037 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -554,5 +554,4 @@ public class BrooklynRestResourceUtils { public void reloadBrooklynProperties() { mgmt.reloadBrooklynProperties(); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java b/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java index 7963e48..a3a3b6f 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/DefaultExceptionMapper.java @@ -99,5 +99,4 @@ public class DefaultExceptionMapper implements ExceptionMapper<Throwable> { rb.message("Internal error. Contact server administrator to consult logs for more details."); return rb.build().asResponse(Status.INTERNAL_SERVER_ERROR, MediaType.APPLICATION_JSON_TYPE); } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/EntityLocationUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/EntityLocationUtils.java b/usage/rest-server/src/main/java/brooklyn/rest/util/EntityLocationUtils.java index 5bc51cd..2325926 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/EntityLocationUtils.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/EntityLocationUtils.java @@ -82,5 +82,4 @@ public class EntityLocationUtils { protected boolean isLocatedLocation(Location l) { return l.getConfig(LocationConfigKeys.LATITUDE)!=null && l.getConfig(LocationConfigKeys.LONGITUDE)!=null; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/FormMapProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/FormMapProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/util/FormMapProvider.java index eb6a60a..a8a084c 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/FormMapProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/FormMapProvider.java @@ -78,5 +78,4 @@ public class FormMapProvider implements MessageBodyReader<Map<String, Object>> { } return map; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/WebResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/WebResourceUtils.java b/usage/rest-server/src/main/java/brooklyn/rest/util/WebResourceUtils.java index 06c81b1..2a4f5e2 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/WebResourceUtils.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/WebResourceUtils.java @@ -139,5 +139,4 @@ public class WebResourceUtils { return Urls.encode(versionedId); } } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java index b79de3f..85c6072 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java @@ -169,5 +169,4 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements public void injectManagementContext(ManagementContext mgmt) { this.mgmt = mgmt; } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/json/ConfigurableSerializerProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/json/ConfigurableSerializerProvider.java b/usage/rest-server/src/main/java/brooklyn/rest/util/json/ConfigurableSerializerProvider.java index 81099e6..73d502f 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/json/ConfigurableSerializerProvider.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/json/ConfigurableSerializerProvider.java @@ -91,5 +91,4 @@ final class ConfigurableSerializerProvider extends StdSerializerProvider { unknownTypeSerializer.serialize(value, jgen, this); } } - -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java b/usage/rest-server/src/main/java/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java index f4afbd5..c059a04 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java @@ -122,5 +122,4 @@ public class ErrorAndToStringUnknownTypeSerializer extends UnknownSerializer { return false; } } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/json/MultimapSerializer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/json/MultimapSerializer.java b/usage/rest-server/src/main/java/brooklyn/rest/util/json/MultimapSerializer.java index 294f771..f433500 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/json/MultimapSerializer.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/json/MultimapSerializer.java @@ -59,5 +59,4 @@ public class MultimapSerializer extends SerializerBase<Multimap<?, ?>> { provider.defaultSerializeValue(Lists.newArrayList(entry.getValue()), jgen); } } - } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/main/java/brooklyn/rest/util/json/PossiblyStrictPreferringFieldsVisibilityChecker.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/json/PossiblyStrictPreferringFieldsVisibilityChecker.java b/usage/rest-server/src/main/java/brooklyn/rest/util/json/PossiblyStrictPreferringFieldsVisibilityChecker.java index 3f8e79d..dc033bc 100644 --- a/usage/rest-server/src/main/java/brooklyn/rest/util/json/PossiblyStrictPreferringFieldsVisibilityChecker.java +++ b/usage/rest-server/src/main/java/brooklyn/rest/util/json/PossiblyStrictPreferringFieldsVisibilityChecker.java @@ -104,4 +104,4 @@ public class PossiblyStrictPreferringFieldsVisibilityChecker implements Visibili public boolean isFieldVisible(AnnotatedField f) { return isFieldVisible(f.getAnnotated()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/test/java/brooklyn/rest/domain/ApplicationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/domain/ApplicationTest.java b/usage/rest-server/src/test/java/brooklyn/rest/domain/ApplicationTest.java index f3fa08d..cb98129 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/domain/ApplicationTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/domain/ApplicationTest.java @@ -41,57 +41,54 @@ import com.google.common.collect.ImmutableSet; public class ApplicationTest { - final EntitySpec entitySpec = new EntitySpec("Vanilla Java App", "brooklyn.entity.java.VanillaJavaApp", - ImmutableMap.<String, String>of( - "initialSize", "1", - "creationScriptUrl", "http://my.brooklyn.io/storage/foo.sql"; - )); + final EntitySpec entitySpec = new EntitySpec("Vanilla Java App", "brooklyn.entity.java.VanillaJavaApp", + ImmutableMap.<String, String>of( + "initialSize", "1", + "creationScriptUrl", "http://my.brooklyn.io/storage/foo.sql";)); - final ApplicationSpec applicationSpec = ApplicationSpec.builder().name("myapp"). - entities(ImmutableSet.of(entitySpec)). - locations(ImmutableSet.of("/v1/locations/1")). - build(); + final ApplicationSpec applicationSpec = ApplicationSpec.builder().name("myapp") + .entities(ImmutableSet.of(entitySpec)) + .locations(ImmutableSet.of("/v1/locations/1")) + .build(); - final ApplicationSummary application = new ApplicationSummary(null, applicationSpec, Status.STARTING, null); + final ApplicationSummary application = new ApplicationSummary(null, applicationSpec, Status.STARTING, null); - @Test - public void testSerializeToJSON() throws IOException { - ApplicationSummary application1 = new ApplicationSummary("myapp_id", applicationSpec, Status.STARTING, null) { - @Override - public Map<String, URI> getLinks() { - return ImmutableMap.of( - "self", URI.create("/v1/applications/" + applicationSpec.getName()), - "entities", URI.create("fixtures/entity-summary-list.json") - ); - } - }; - assertEquals(asJson(application1), jsonFixture("fixtures/application.json")); - } + @Test + public void testSerializeToJSON() throws IOException { + ApplicationSummary application1 = new ApplicationSummary("myapp_id", applicationSpec, Status.STARTING, null) { + @Override + public Map<String, URI> getLinks() { + return ImmutableMap.of( + "self", URI.create("/v1/applications/" + applicationSpec.getName()), + "entities", URI.create("fixtures/entity-summary-list.json")); + } + }; + assertEquals(asJson(application1), jsonFixture("fixtures/application.json")); + } - @Test - public void testDeserializeFromJSON() throws IOException { - assertEquals(fromJson(jsonFixture("fixtures/application.json"), - ApplicationSummary.class), application); - } + @Test + public void testDeserializeFromJSON() throws IOException { + assertEquals(fromJson(jsonFixture("fixtures/application.json"), + ApplicationSummary.class), application); + } - @Test - public void testTransitionToRunning() { + @Test + public void testTransitionToRunning() { ApplicationSummary running = application.transitionTo(Status.RUNNING); assertEquals(running.getStatus(), Status.RUNNING); - } - - @Test - public void testAppInAppTest() throws IOException { - TestApplicationImpl app = new TestApplicationImpl(); - ManagementContext mgmt = Entities.startManagement(app); - try { - Entity e2 = app.addChild(new TestApplicationImpl()); - Entities.manage(e2); - if (mgmt.getApplications().size()!=1) - Assert.fail("Apps in Apps should not be listed at top level: "+mgmt.getApplications()); - } finally { - Entities.destroyAll(mgmt); - } - } + } + @Test + public void testAppInAppTest() throws IOException { + TestApplicationImpl app = new TestApplicationImpl(); + ManagementContext mgmt = Entities.startManagement(app); + try { + Entity e2 = app.addChild(new TestApplicationImpl()); + Entities.manage(e2); + if (mgmt.getApplications().size()!=1) + Assert.fail("Apps in Apps should not be listed at top level: "+mgmt.getApplications()); + } finally { + Entities.destroyAll(mgmt); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java b/usage/rest-server/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java index 35e7dd6..061dde7 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java @@ -34,22 +34,21 @@ import brooklyn.rest.transform.LocationTransformer; public class LocationSummaryTest { - final LocationSummary summary = LocationTransformer.newInstance("123", LocationSpec.localhost()); - - @Test - public void testSerializeToJSON() throws IOException { - assertEquals(asJson(summary), jsonFixture("fixtures/location-summary.json")); - } - - @Test - public void testDeserializeFromJSON() throws IOException { - assertEquals(fromJson(jsonFixture("fixtures/location-summary.json"), LocationSummary.class), summary); - } - - @Test - public void testDeserializeListFromJSON() throws IOException { - assertEquals(fromJson(jsonFixture("fixtures/location-list.json"), new TypeReference<List<LocationSummary>>() {}), - Collections.singletonList(summary)); - } - + final LocationSummary summary = LocationTransformer.newInstance("123", LocationSpec.localhost()); + + @Test + public void testSerializeToJSON() throws IOException { + assertEquals(asJson(summary), jsonFixture("fixtures/location-summary.json")); + } + + @Test + public void testDeserializeFromJSON() throws IOException { + assertEquals(fromJson(jsonFixture("fixtures/location-summary.json"), LocationSummary.class), summary); + } + + @Test + public void testDeserializeListFromJSON() throws IOException { + assertEquals(fromJson(jsonFixture("fixtures/location-list.json"), new TypeReference<List<LocationSummary>>() {}), + Collections.singletonList(summary)); + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bfac921f/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java index a524966..f7a0fcf 100644 --- a/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java +++ b/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java @@ -45,58 +45,58 @@ import com.google.common.collect.ImmutableMap; public class SensorSummaryTest { - private SensorSummary sensorSummary = new SensorSummary("redis.uptime", "Integer", - "Description", ImmutableMap.of( - "self", URI.create("/v1/applications/redis-app/entities/redis-ent/sensors/redis.uptime"))); - - private TestApplication app; - private TestEntity entity; - private ManagementContext mgmt; - - @BeforeMethod(alwaysRun=true) - public void setUp() throws Exception { - app = TestApplication.Factory.newManagedInstanceForTests(); - mgmt = app.getManagementContext(); - entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)); - } - - @AfterMethod(alwaysRun=true) - public void tearDown() throws Exception { - if (mgmt != null) Entities.destroyAll(mgmt); - } - - @Test - public void testSerializeToJSON() throws IOException { - assertEquals(asJson(sensorSummary), jsonFixture("fixtures/sensor-summary.json")); - } - - @Test - public void testDeserializeFromJSON() throws IOException { - assertEquals(fromJson(jsonFixture("fixtures/sensor-summary.json"), SensorSummary.class), sensorSummary); - } - - @Test - public void testEscapesUriForSensorName() throws IOException { - Sensor<String> sensor = Sensors.newStringSensor("name with space"); - SensorSummary summary = SensorTransformer.sensorSummary(entity, sensor); - URI selfUri = summary.getLinks().get("self"); - - String expectedUri = "/v1/applications/" + entity.getApplicationId() + "/entities/" + entity.getId() + "/sensors/" + "name%20with%20space"; - - assertEquals(selfUri, URI.create(expectedUri)); - } - - // Previously failed because immutable-map builder threw exception if put same key multiple times, - // and the NamedActionWithUrl did not have equals/hashCode - @Test - public void testSensorWithMultipleOpenUrlActionsRegistered() throws IOException { - AttributeSensor<String> sensor = Sensors.newStringSensor("sensor1"); - entity.setAttribute(sensor, "http://myval";); - RendererHints.register(sensor, RendererHints.namedActionWithUrl()); - RendererHints.register(sensor, RendererHints.namedActionWithUrl()); - - SensorSummary summary = SensorTransformer.sensorSummary(entity, sensor); - - assertEquals(summary.getLinks().get("action:open"), URI.create("http://myval";)); - } + private SensorSummary sensorSummary = new SensorSummary("redis.uptime", "Integer", + "Description", ImmutableMap.of( + "self", URI.create("/v1/applications/redis-app/entities/redis-ent/sensors/redis.uptime"))); + + private TestApplication app; + private TestEntity entity; + private ManagementContext mgmt; + + @BeforeMethod(alwaysRun = true) + public void setUp() throws Exception { + app = TestApplication.Factory.newManagedInstanceForTests(); + mgmt = app.getManagementContext(); + entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)); + } + + @AfterMethod(alwaysRun = true) + public void tearDown() throws Exception { + if (mgmt != null) Entities.destroyAll(mgmt); + } + + @Test + public void testSerializeToJSON() throws IOException { + assertEquals(asJson(sensorSummary), jsonFixture("fixtures/sensor-summary.json")); + } + + @Test + public void testDeserializeFromJSON() throws IOException { + assertEquals(fromJson(jsonFixture("fixtures/sensor-summary.json"), SensorSummary.class), sensorSummary); + } + + @Test + public void testEscapesUriForSensorName() throws IOException { + Sensor<String> sensor = Sensors.newStringSensor("name with space"); + SensorSummary summary = SensorTransformer.sensorSummary(entity, sensor); + URI selfUri = summary.getLinks().get("self"); + + String expectedUri = "/v1/applications/" + entity.getApplicationId() + "/entities/" + entity.getId() + "/sensors/" + "name%20with%20space"; + + assertEquals(selfUri, URI.create(expectedUri)); + } + + // Previously failed because immutable-map builder threw exception if put same key multiple times, + // and the NamedActionWithUrl did not have equals/hashCode + @Test + public void testSensorWithMultipleOpenUrlActionsRegistered() throws IOException { + AttributeSensor<String> sensor = Sensors.newStringSensor("sensor1"); + entity.setAttribute(sensor, "http://myval";); + RendererHints.register(sensor, RendererHints.namedActionWithUrl()); + RendererHints.register(sensor, RendererHints.namedActionWithUrl()); + + SensorSummary summary = SensorTransformer.sensorSummary(entity, sensor); + + assertEquals(summary.getLinks().get("action:open"), URI.create("http://myval";)); + } }
