http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java index 4794239..64c5800 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/DelegatingSecurityProvider.java @@ -25,13 +25,10 @@ import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.config.StringConfigMap; - import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.rest.BrooklynWebConfig; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; public class DelegatingSecurityProvider implements SecurityProvider {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java index 4ca06f3..42caafb 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java @@ -28,9 +28,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; -import brooklyn.config.StringConfigMap; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.security.PasswordHasher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java index 01af1d0..09fd9eb 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/LdapSecurityProvider.java @@ -30,13 +30,11 @@ import org.slf4j.LoggerFactory; import com.google.common.base.CharMatcher; -import brooklyn.config.StringConfigMap; - import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.rest.BrooklynWebConfig; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java index 32c32d4..9eece3f 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java @@ -23,9 +23,8 @@ import java.util.Map; import java.util.Set; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynTypes; - +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.api.entity.Effector; @@ -38,7 +37,6 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityDynamicType; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; @@ -52,9 +50,8 @@ import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.domain.SummaryComparators; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java index 32a8887..aba7f0c 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EffectorTransformer.java @@ -32,9 +32,8 @@ import org.apache.brooklyn.core.util.task.ValueResolver; import org.apache.brooklyn.rest.domain.EffectorSummary; import org.apache.brooklyn.rest.domain.EffectorSummary.ParameterSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java index a2b826b..7211751 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java @@ -29,16 +29,15 @@ import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.config.render.RendererHints; import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.URLParamEncoder; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.URLParamEncoder; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java index f1b6959..3e72aed 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java @@ -35,10 +35,9 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java index 35e62d6..d8ca4a0 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java @@ -21,11 +21,10 @@ package org.apache.brooklyn.rest.transform; import java.net.URI; import java.util.Map; -import brooklyn.config.ConfigKey; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.Policies; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java index a145ee0..456aab2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java @@ -29,11 +29,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.rest.domain.SensorSummary; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.URLParamEncoder; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.URLParamEncoder; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java index ead9ba5..2e3c335 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java @@ -40,10 +40,9 @@ import org.apache.brooklyn.core.util.task.TaskInternal; import org.apache.brooklyn.rest.domain.LinkWithMetadata; import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java index ef26693..b68a0ee 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -37,9 +37,7 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynTypes; - import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; @@ -50,13 +48,13 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.TypeCoercions; -import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ApplicationBuilder; @@ -68,12 +66,11 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.net.Urls; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java index 8d78462..bef25e2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/DefaultExceptionMapper.java @@ -34,11 +34,10 @@ import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.util.flags.ClassCoercionException; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.domain.ApiError.Builder; - -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.UserFacingException; +import org.apache.brooklyn.util.text.Strings; @Provider public class DefaultExceptionMapper implements ExceptionMapper<Throwable> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java index bfb6a3b..8c25fda 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.rest.util; /** - * @deprecated since 0.7.0 use {@link brooklyn.util.net.URLParamEncoder} + * @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.net.URLParamEncoder} */ -public class URLParamEncoder extends brooklyn.util.net.URLParamEncoder { +public class URLParamEncoder extends org.apache.brooklyn.util.net.URLParamEncoder { } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java index da84841..e8f2505 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java @@ -33,10 +33,9 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Urls; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.collect.ImmutableMap; import com.sun.jersey.spi.container.ContainerResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java index 4c3ad5e..afc5ac2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java @@ -23,6 +23,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.codehaus.jackson.Version; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; @@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ConfigurableSerializerProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ConfigurableSerializerProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ConfigurableSerializerProvider.java index 20078df..3078524 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ConfigurableSerializerProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ConfigurableSerializerProvider.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.rest.util.json; import java.io.IOException; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.JsonStreamContext; @@ -29,8 +30,6 @@ import org.codehaus.jackson.map.SerializerFactory; import org.codehaus.jackson.map.ser.StdSerializerProvider; import org.codehaus.jackson.type.JavaType; -import brooklyn.util.exceptions.Exceptions; - /** allows the serializer-of-last-resort to be customized, ie used for unknown-types */ final class ConfigurableSerializerProvider extends StdSerializerProvider { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java index b865cb0..8d18c8a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/ErrorAndToStringUnknownTypeSerializer.java @@ -25,6 +25,8 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.javalang.Reflections; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonProcessingException; @@ -36,9 +38,6 @@ import org.codehaus.jackson.map.ser.impl.UnknownSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.javalang.Reflections; - /** * for non-json-serializable classes (quite a lot of them!) simply provide a sensible error message and a toString. * TODO maybe we want to attempt to serialize fields instead? (but being careful not to be self-referential!) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java index 220e464..2a1a0de 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/entity/brooklynnode/DeployBlueprintTest.java @@ -41,8 +41,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.test.HttpTestUtils; - -import brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Functionals; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java index 4320321..53a5a13 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java @@ -38,9 +38,8 @@ import org.testng.annotations.Test; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Time; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java index 5bf673d..e4bf5d6 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java @@ -59,10 +59,9 @@ import org.apache.brooklyn.rest.security.provider.SecurityProvider; import org.apache.brooklyn.rest.util.ManagementContextProvider; import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; import org.apache.brooklyn.rest.util.TestShutdownHandler; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Networking; -import brooklyn.util.text.WildcardGlobs; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.WildcardGlobs; import com.google.common.annotations.Beta; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java index ead95ba..a6fc407 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java @@ -24,14 +24,13 @@ import static org.apache.brooklyn.rest.BrooklynRestApiLauncher.StartMode.WEB_XML import java.util.concurrent.Callable; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.http.HttpStatus; import org.eclipse.jetty.server.Server; import org.testng.annotations.Test; - import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtilsTest.SampleNoOpApplication; -import brooklyn.test.Asserts; public class BrooklynRestApiLauncherTest extends BrooklynRestApiLauncherTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java index 2a2a569..54118e7 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java @@ -32,8 +32,7 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; public abstract class BrooklynRestApiLauncherTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java index 3f529ca..c065abc 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java @@ -45,10 +45,9 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; - -import brooklyn.test.Asserts; -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Predicates; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java index f5a6ed6..9292364 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java @@ -32,14 +32,15 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.Lifecycle; + import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java index c4dc88e..dc67423 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java @@ -34,7 +34,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -59,11 +63,11 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; + import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.geo.HostGeoInfo; - import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.rest.domain.ApiError; @@ -84,11 +88,6 @@ import org.apache.brooklyn.rest.testing.mocks.RestMockApp; import org.apache.brooklyn.rest.testing.mocks.RestMockAppBuilder; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; -import brooklyn.test.Asserts; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; - @Test(singleThreaded = true) public class ApplicationResourceTest extends BrooklynRestResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java index e9c1f44..09dc88e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java @@ -43,9 +43,8 @@ import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.text.StringEscapes; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.text.StringEscapes; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java index 3d089f7..ba4f85f 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java @@ -38,12 +38,13 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; + import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Optional; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java index 680828b..16988cd 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/EntityResourceTest.java @@ -46,9 +46,8 @@ import org.apache.brooklyn.rest.domain.TaskSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.HttpTestUtils; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java index d4c0089..5d5f697 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/LocationResourceTest.java @@ -48,8 +48,7 @@ import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.domain.LocationSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; - -import brooklyn.test.Asserts; +import org.apache.brooklyn.test.Asserts; @Test(singleThreaded = true) public class LocationResourceTest extends BrooklynRestResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java index 354f4ed..9c35055 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceIntegrationTest.java @@ -41,9 +41,8 @@ import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.HttpTestUtils; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.net.Urls; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.net.Urls; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java index 759db86..462e8d6 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java @@ -43,10 +43,9 @@ import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.HttpTestUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.StringFunctions; import com.google.common.base.Functions; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index 13de9e9..975fd22 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -50,9 +50,8 @@ import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; - -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.exceptions.Exceptions; @Test(singleThreaded = true) public class ServerResourceTest extends BrooklynRestResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java index 49abc79..9616040 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerShutdownTest.java @@ -27,8 +27,10 @@ import java.util.concurrent.atomic.AtomicReference; import javax.ws.rs.core.MultivaluedMap; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -54,9 +56,6 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.rest.resources.ServerResourceTest.StopLatchEntity; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; - public class ServerShutdownTest extends BrooklynRestResourceTest { private static final Logger log = LoggerFactory.getLogger(ServerResourceTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java index fd3504d..3048057 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java @@ -55,9 +55,8 @@ import org.apache.brooklyn.rest.domain.UsageStatistics; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import org.apache.brooklyn.test.entity.TestApplication; - -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Time; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java index d6a8829..b04ca6b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java @@ -46,8 +46,7 @@ import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; import org.apache.brooklyn.rest.util.TestShutdownHandler; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; public abstract class BrooklynRestApiTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java index 01301b8..b5e3f17 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java @@ -41,10 +41,9 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.Status; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.UniformInterfaceException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java index e15d779..5f6cc3e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroup.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.rest.testing.mocks; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; @ImplementedBy(NameMatcherGroupImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroupImpl.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroupImpl.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroupImpl.java index f0a307c..39d85ad 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroupImpl.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/NameMatcherGroupImpl.java @@ -18,9 +18,10 @@ */ package org.apache.brooklyn.rest.testing.mocks; +import org.apache.brooklyn.util.text.StringPredicates; + import brooklyn.entity.basic.DynamicGroupImpl; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.util.text.StringPredicates; public class NameMatcherGroupImpl extends DynamicGroupImpl implements NameMatcherGroup { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java index 55d2680..2247f5f 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java @@ -20,10 +20,10 @@ package org.apache.brooklyn.rest.testing.mocks; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.util.javalang.Reflections; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.StartableApplication; -import brooklyn.util.javalang.Reflections; public class RestMockAppBuilder extends ApplicationBuilder { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index 1bb5677..b0b222d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -23,11 +23,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java index f1546ff..46444f9 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.rest.testing.mocks; import java.util.Map; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; public class RestMockSimplePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java index 2c5c1d6..812eb48 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java @@ -47,8 +47,7 @@ import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestEntityImpl; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java index 7968089..ae9a510 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java @@ -48,12 +48,11 @@ import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java index d5215a8..cbe6acb 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java @@ -35,9 +35,8 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.SubscriptionHandle; - -import brooklyn.config.ConfigKey; -import brooklyn.test.Asserts; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.test.Asserts; import com.google.common.annotations.Beta; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java index 455bc7e..eed5ef4 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java @@ -39,17 +39,16 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSession; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.crypto.SslTrustUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.crypto.SslTrustUtils; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Time; - import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java index 9811776..7b48eaf 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java @@ -22,14 +22,13 @@ import static org.testng.Assert.assertTrue; import java.util.Map; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Networking; -import brooklyn.util.time.Duration; - import com.google.common.collect.ImmutableMap; public class NetworkingTestUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java index 2b765cd..da38791 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java @@ -28,12 +28,11 @@ import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import javax.management.ObjectName; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; public class PerformanceTestUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy b/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy index 42e6287..acd083c 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy @@ -28,12 +28,12 @@ import java.util.concurrent.Executors import org.codehaus.groovy.runtime.InvokerInvocationException import org.slf4j.Logger import org.slf4j.LoggerFactory - import org.apache.brooklyn.api.entity.Entity import org.apache.brooklyn.api.event.AttributeSensor -import brooklyn.test.Asserts; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.time.Duration +import org.apache.brooklyn.test.Asserts; + +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.time.Duration import com.google.common.base.Predicate import com.google.common.base.Supplier http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java index daba835..d804312 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java @@ -23,13 +23,12 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.testng.Assert; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; - /** * Repeatedly polls a given URL, to check if it is always available. * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/utils/common/src/main/java/brooklyn/config/ConfigInheritance.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/ConfigInheritance.java b/utils/common/src/main/java/brooklyn/config/ConfigInheritance.java deleted file mode 100644 index a748be4..0000000 --- a/utils/common/src/main/java/brooklyn/config/ConfigInheritance.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.config; - -import java.io.Serializable; - -import com.google.common.annotations.Beta; - -@SuppressWarnings("serial") -public abstract class ConfigInheritance implements Serializable { - - public static final ConfigInheritance ALWAYS = new Always(); - public static final ConfigInheritance NONE = new None(); - - private ConfigInheritance() {} - - @Beta - public abstract boolean isInherited(ConfigKey<?> key, Object from, Object to); - - private static class Always extends ConfigInheritance { - @Override - public boolean isInherited(ConfigKey<?> key, Object from, Object to) { - return true; - } - } - - private static class None extends ConfigInheritance { - @Override - public boolean isInherited(ConfigKey<?> key, Object from, Object to) { - return false; - } - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/utils/common/src/main/java/brooklyn/config/ConfigKey.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/ConfigKey.java b/utils/common/src/main/java/brooklyn/config/ConfigKey.java deleted file mode 100644 index cf5b128..0000000 --- a/utils/common/src/main/java/brooklyn/config/ConfigKey.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.config; - -import java.util.Collection; - -import javax.annotation.Nullable; - -import com.google.common.reflect.TypeToken; - -/** - * Represents the name of a piece of typed configuration data for an entity. - * <p> - * Two ConfigKeys should be considered equal if they have the same FQN. - */ -public interface ConfigKey<T> { - /** - * Returns the description of the configuration parameter, for display. - */ - String getDescription(); - - /** - * Returns the name of the configuration parameter, in a dot-separated namespace (FQN). - */ - String getName(); - - /** - * Returns the constituent parts of the configuration parameter name as a {@link Collection}. - */ - Collection<String> getNameParts(); - - /** - * Returns the Guava TypeToken, including info on generics. - */ - TypeToken<T> getTypeToken(); - - /** - * Returns the type of the configuration parameter data. - * <p> - * This returns a "super" of T only in the case where T is generified, - * and in such cases it returns the Class instance for the unadorned T --- - * i.e. for List<String> this returns Class<List> --- - * this is of course because there is no actual Class<List<String>> instance. - */ - Class<? super T> getType(); - - /** - * Returns the name of of the configuration parameter data type, as a {@link String}. - */ - String getTypeName(); - - /** - * Returns the default value of the configuration parameter. - */ - T getDefaultValue(); - - /** - * Returns true if a default configuration value has been set. - */ - boolean hasDefaultValue(); - - /** - * @return True if the configuration can be changed at runtime. - */ - boolean isReconfigurable(); - - /** - * @return The inheritance model, or <code>null</code> for the default in any context. - */ - @Nullable ConfigInheritance getInheritance(); - - /** Interface for elements which want to be treated as a config key without actually being one - * (e.g. config attribute sensors). - */ - public interface HasConfigKey<T> { - public ConfigKey<T> getConfigKey(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/utils/common/src/main/java/brooklyn/config/ConfigMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/ConfigMap.java b/utils/common/src/main/java/brooklyn/config/ConfigMap.java deleted file mode 100644 index eeb0fd0..0000000 --- a/utils/common/src/main/java/brooklyn/config/ConfigMap.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.config; - -import java.util.Map; - -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.guava.Maybe; - -import com.google.common.base.Predicate; - -public interface ConfigMap { - - /** @see #getConfig(ConfigKey, Object), with default value as per the key, or null */ - public <T> T getConfig(ConfigKey<T> key); - - /** @see #getConfig(ConfigKey, Object), with default value as per the key, or null */ - public <T> T getConfig(HasConfigKey<T> key); - - /** - * @see #getConfig(ConfigKey, Object), with provided default value if not set - * @deprecated since 0.7.0; use {@link #getConfig(HasConfigKey)} - */ - @Deprecated - public <T> T getConfig(HasConfigKey<T> key, T defaultValue); - - /** - * Returns value stored against the given key, - * resolved (if it is a Task, possibly blocking), and coerced to the appropriate type, - * or given default value if not set, - * unless the default value is null in which case it returns the default. - * - * @deprecated since 0.7.0; use {@link #getConfig(ConfigKey)} - */ - @Deprecated - public <T> T getConfig(ConfigKey<T> key, T defaultValue); - - /** as {@link #getConfigRaw(ConfigKey)} but returning null if not present - * @deprecated since 0.7.0 use {@link #getConfigRaw(ConfigKey)} */ - @Deprecated - public Object getRawConfig(ConfigKey<?> key); - - /** returns the value stored against the given key, - * <b>not</b> any default, - * <b>not</b> resolved (and guaranteed non-blocking), - * and <b>not</b> type-coerced. - * @param key key to look up - * @param includeInherited for {@link ConfigMap} instances which have an inheritance hierarchy, - * whether to traverse it or not; has no effects where there is no inheritance - * @return raw, unresolved, uncoerced value of key in map, - * but <b>not</b> any default on the key - */ - public Maybe<Object> getConfigRaw(ConfigKey<?> key, boolean includeInherited); - - /** returns a map of all config keys to their raw (unresolved+uncoerced) contents */ - public Map<ConfigKey<?>,Object> getAllConfig(); - - /** returns submap matching the given filter predicate; see ConfigPredicates for common predicates */ - public ConfigMap submap(Predicate<ConfigKey<?>> filter); - - /** returns a read-only map view which has string keys (corresponding to the config key names); - * callers encouraged to use the typed keys (and so not use this method), - * but in some compatibility areas having a Properties-like view is useful */ - public Map<String,Object> asMapWithStringKeys(); - - public int size(); - - public boolean isEmpty(); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/utils/common/src/main/java/brooklyn/config/StringConfigMap.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java b/utils/common/src/main/java/brooklyn/config/StringConfigMap.java deleted file mode 100644 index d292d1a..0000000 --- a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package brooklyn.config; - -import java.util.Map; - -/** convenience extension where map is principally strings or converted to strings - * (supporting BrooklynProperties) */ -public interface StringConfigMap extends ConfigMap { - /** @see #getFirst(java.util.Map, String...) */ - public String getFirst(String... keys); - /** returns the value of the first key which is defined - * <p> - * takes the following flags: - * 'warnIfNone' or 'failIfNone' (both taking a boolean (to use default message) or a string (which is the message)); - * and 'defaultIfNone' (a default value to return if there is no such property); - * defaults to no warning and null default value */ - public String getFirst(@SuppressWarnings("rawtypes") Map flags, String... keys); -}
