http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java index 79fe68f..ca2913b 100644 --- a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java +++ b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java @@ -28,17 +28,17 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.javalang.Threads; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.trait.Startable; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.javalang.Threads; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java b/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java index 2904ff5..8c00311 100644 --- a/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java +++ b/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java @@ -36,16 +36,15 @@ import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.TaskTags; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.MemoryUsageTracker; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.BashStringEscapes; import org.codehaus.jackson.annotate.JsonProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.MemoryUsageTracker; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.StringEscapes.BashStringEscapes; -import brooklyn.util.text.Strings; - import com.google.common.annotations.Beta; import com.google.common.base.Functions; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java index a50c800..d79e227 100644 --- a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java +++ b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java @@ -22,19 +22,19 @@ import java.util.Map; import javax.annotation.Nonnull; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey.BasicConfigKeyOverwriting; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/ConfigMapViewWithStringKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ConfigMapViewWithStringKeys.java b/core/src/main/java/brooklyn/entity/basic/ConfigMapViewWithStringKeys.java index 68ec98c..303764b 100644 --- a/core/src/main/java/brooklyn/entity/basic/ConfigMapViewWithStringKeys.java +++ b/core/src/main/java/brooklyn/entity/basic/ConfigMapViewWithStringKeys.java @@ -23,7 +23,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; + import brooklyn.event.basic.BasicConfigKey; import com.google.common.annotations.Beta; @@ -36,9 +37,9 @@ import com.google.common.collect.Sets; @Beta public class ConfigMapViewWithStringKeys implements Map<String,Object> { - private brooklyn.config.ConfigMap target; + private org.apache.brooklyn.config.ConfigMap target; - public ConfigMapViewWithStringKeys(brooklyn.config.ConfigMap target) { + public ConfigMapViewWithStringKeys(org.apache.brooklyn.config.ConfigMap target) { this.target = target; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/ConfigurableEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ConfigurableEntityFactory.java b/core/src/main/java/brooklyn/entity/basic/ConfigurableEntityFactory.java index ebca1c1..36c8dc5 100644 --- a/core/src/main/java/brooklyn/entity/basic/ConfigurableEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/basic/ConfigurableEntityFactory.java @@ -18,11 +18,10 @@ */ package brooklyn.entity.basic; -import brooklyn.config.ConfigKey; - import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; public interface ConfigurableEntityFactory<T extends Entity> extends EntityFactory<T> { ConfigurableEntityFactory<T> configure(Map flags); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/DataEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntity.java b/core/src/main/java/brooklyn/entity/basic/DataEntity.java index 534e125..9ae4efe 100644 --- a/core/src/main/java/brooklyn/entity/basic/DataEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/DataEntity.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.trait.Startable; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java index 9ad8c83..3bccd03 100644 --- a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java +++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java @@ -23,15 +23,16 @@ import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.base.Predicate; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.Sensors; + import groovy.lang.Closure; @ImplementedBy(DynamicGroupImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java index 3b1eb47..7982402 100644 --- a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java @@ -31,13 +31,13 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.CollectionChangeListener; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.config.BrooklynLogging.LoggingLevel; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java index f60f408..d903bd0 100644 --- a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java @@ -23,12 +23,12 @@ import java.util.Collection; 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.trait.Startable; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/Entities.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java index 87869e3..d5790c2 100644 --- a/core/src/main/java/brooklyn/entity/basic/Entities.java +++ b/core/src/main/java/brooklyn/entity/basic/Entities.java @@ -59,6 +59,8 @@ import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.management.internal.EffectorUtils; import org.apache.brooklyn.core.management.internal.EntityManagerInternal; import org.apache.brooklyn.core.management.internal.LocalManagementContext; @@ -75,11 +77,9 @@ import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.core.util.task.system.SystemTasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynObjectInternal; + import brooklyn.config.BrooklynProperties; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntityProxyImpl; import brooklyn.entity.trait.Startable; @@ -88,13 +88,12 @@ import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.Locations; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java b/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java index 4c894d5..d48d395 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityAdjuncts.java @@ -24,12 +24,12 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EntityAdjunct; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.guava.Maybe; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceState; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; -import brooklyn.util.collections.MutableList; -import brooklyn.util.guava.Maybe; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java index 8a7a9f0..49498e6 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java @@ -28,20 +28,20 @@ import java.util.Set; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; import brooklyn.config.internal.AbstractConfigMapImpl; import brooklyn.event.basic.StructuredConfigKey; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; import com.google.common.base.Predicate; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java index 794fdaf..c02e34e 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java @@ -32,16 +32,16 @@ import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.event.Sensor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynDynamicType; -import brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.javalang.Reflections; + import brooklyn.entity.effector.EffectorAndBody; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.entity.effector.EffectorWithBody; import brooklyn.entity.effector.Effectors; -import brooklyn.util.javalang.Reflections; import com.google.common.annotations.Beta; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java index d9afc44..043c503 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java @@ -30,10 +30,9 @@ import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; - -import brooklyn.config.ConfigKey; -import brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Functionals; import com.google.common.base.Function; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java index d9967d1..53b76b2 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java @@ -32,11 +32,10 @@ import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.EntityManagementSupport; import org.apache.brooklyn.core.util.config.ConfigBag; - import org.apache.brooklyn.basic.BrooklynObjectInternal; -import brooklyn.config.ConfigKey; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java index 892afc7..d6cb60a 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java @@ -27,13 +27,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.guava.SerializablePredicate; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.guava.SerializablePredicate; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.StringPredicates; import com.google.common.base.Objects; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java index 51dac64..1d138ec 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java @@ -21,10 +21,10 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.time.Duration; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.time.Duration; import com.google.common.base.Functions; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java index 56e73d1..3514b5c 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -37,14 +37,14 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.management.internal.EntityManagementSupport; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.guava.Maybe; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.EntityInternal.FeedSupport; import brooklyn.entity.proxying.EntityProxyImpl; -import brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java index dddecf6..13e2b5c 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java @@ -28,10 +28,9 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.event.Sensor; - import org.apache.brooklyn.basic.BrooklynTypeSnapshot; -import brooklyn.config.ConfigKey; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Joiner; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/Lifecycle.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java index 97e3ada..177ddd3 100644 --- a/core/src/main/java/brooklyn/entity/basic/Lifecycle.java +++ b/core/src/main/java/brooklyn/entity/basic/Lifecycle.java @@ -24,7 +24,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import brooklyn.config.render.RendererHints; -import brooklyn.util.text.StringFunctions; import com.google.common.base.CaseFormat; import com.google.common.base.Function; @@ -33,6 +32,7 @@ import com.google.common.base.Preconditions; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.text.StringFunctions; /** * An enumeration representing the status of an {@link org.apache.brooklyn.api.entity.Entity}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/MethodEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java index f5978b7..0640a02 100644 --- a/core/src/main/java/brooklyn/entity/basic/MethodEffector.java +++ b/core/src/main/java/brooklyn/entity/basic/MethodEffector.java @@ -29,13 +29,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.core.management.internal.EffectorUtils; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.codehaus.groovy.runtime.MethodClosure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.annotation.EffectorParam; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/QuorumCheck.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/QuorumCheck.java b/core/src/main/java/brooklyn/entity/basic/QuorumCheck.java index 6fffb59..b9c4557 100644 --- a/core/src/main/java/brooklyn/entity/basic/QuorumCheck.java +++ b/core/src/main/java/brooklyn/entity/basic/QuorumCheck.java @@ -23,11 +23,11 @@ import java.io.Serializable; /** * For checking if a group/cluster is quorate. That is, whether the group has sufficient * healthy members. - * @deprecated since 0.7.0 use {@link brooklyn.util.collections.QuorumCheck}. + * @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.collections.QuorumCheck}. * but keep this for a while as old quorum checks might be persisted. */ @Deprecated -public interface QuorumCheck extends brooklyn.util.collections.QuorumCheck { +public interface QuorumCheck extends org.apache.brooklyn.util.collections.QuorumCheck { /** * @param sizeHealthy Number of healthy members @@ -74,7 +74,7 @@ public interface QuorumCheck extends brooklyn.util.collections.QuorumCheck { } } - /** @deprecated since 0.7.0 use {@link brooklyn.util.collections.QuorumCheck}. + /** @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.collections.QuorumCheck}. * but keep this until we have a transition defined. */ @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java b/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java index bf4bd43..1baffd4 100644 --- a/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java +++ b/core/src/main/java/brooklyn/entity/basic/ServiceStateLogic.java @@ -37,29 +37,29 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.EnricherSpec.ExtensibleEnricherSpec; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.ValueResolver; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; import brooklyn.config.BrooklynLogging.LoggingLevel; import brooklyn.enricher.Enrichers; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.enricher.basic.AbstractMultipleSensorAggregator; import brooklyn.enricher.basic.UpdatingMap; import brooklyn.entity.basic.Lifecycle.Transition; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.Maybe; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java index 0def1c9..7ef5be7 100644 --- a/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java +++ b/core/src/main/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactory.java @@ -31,12 +31,11 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.paas.PaasLocation; import org.apache.brooklyn.location.basic.WinRmMachineLocation; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.ReferenceWithError; -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.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.text.Strings; /** * Follows a class naming convention: the driver interface typically ends in "Driver", and the implementation http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java index 07d0825..f6e55f9 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadRequirement.java @@ -24,8 +24,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java index abcd49e..7adb834 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadTargets.java @@ -23,8 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; - -import brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java index a112f5e..fb17137 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/BasicDownloadsManager.java @@ -27,9 +27,8 @@ import java.util.Set; import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager; - -import brooklyn.config.StringConfigMap; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java index c94432e..66cb356 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java @@ -22,11 +22,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.StringConfigMap; import brooklyn.event.basic.BasicConfigKey; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java index 198949d..6180eef 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepo.java @@ -22,11 +22,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.StringConfigMap; import brooklyn.event.basic.BasicConfigKey; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java index e5d9364..43f4124 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadProducerFromProperties.java @@ -27,12 +27,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.Attributes; -import brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java index 76eba6d..5fce7ca 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/DownloadSubstituters.java @@ -30,12 +30,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.drivers.EntityDriver; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java b/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java index 87902b3..76c160e 100644 --- a/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java +++ b/core/src/main/java/brooklyn/entity/drivers/downloads/FilenameProducers.java @@ -24,8 +24,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java index 0119dd1..06c6870 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddChildrenEffector.java @@ -23,13 +23,13 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors.EffectorBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/effector/AddEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddEffector.java b/core/src/main/java/brooklyn/entity/effector/AddEffector.java index 0db7c40..74a4a91 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddEffector.java +++ b/core/src/main/java/brooklyn/entity/effector/AddEffector.java @@ -25,14 +25,14 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.Effectors.EffectorBuilder; import brooklyn.event.basic.MapConfigKey; -import brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/effector/AddSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/AddSensor.java b/core/src/main/java/brooklyn/entity/effector/AddSensor.java index 2aa95a6..3ffa4aa 100644 --- a/core/src/main/java/brooklyn/entity/effector/AddSensor.java +++ b/core/src/main/java/brooklyn/entity/effector/AddSensor.java @@ -23,15 +23,15 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.Boxing; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.Sensors; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.Boxing; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java index f9a702e..45fd468 100644 --- a/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java +++ b/core/src/main/java/brooklyn/entity/effector/EffectorTasks.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.EffectorUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicSequentialTask; @@ -36,15 +37,13 @@ import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.basic.WinRmMachineLocation; - -import brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.javalang.Reflections; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/effector/Effectors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/effector/Effectors.java b/core/src/main/java/brooklyn/entity/effector/Effectors.java index c0b6306..9cd4c3a 100644 --- a/core/src/main/java/brooklyn/entity/effector/Effectors.java +++ b/core/src/main/java/brooklyn/entity/effector/Effectors.java @@ -31,12 +31,14 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -44,8 +46,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorMarkingTaskFactory; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java index 400506f..2c00e99 100644 --- a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java +++ b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java @@ -29,17 +29,17 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.javalang.JavaClassNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicCluster.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java index 435308e..9c06403 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicCluster.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicCluster.java @@ -29,9 +29,10 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; @@ -47,7 +48,6 @@ import brooklyn.entity.trait.MemberReplaceable; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java index 1cdbd8e..b999fdf 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicClusterImpl.java @@ -61,16 +61,15 @@ import brooklyn.entity.trait.StartableMethods; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.text.StringPredicates; -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.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicFabric.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabric.java b/core/src/main/java/brooklyn/entity/group/DynamicFabric.java index dc23e7c..ed1bd96 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabric.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabric.java @@ -21,9 +21,9 @@ package brooklyn.entity.group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java index da31efd..fabc01c 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicFabricImpl.java @@ -32,6 +32,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +49,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Changeable; import brooklyn.entity.trait.Startable; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java index d5a8c9a..0c3543f 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroup.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.DynamicGroup; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java index b93a125..4ff54fb 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicMultiGroupImpl.java @@ -29,13 +29,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableMap; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.DynamicGroupImpl; import brooklyn.entity.basic.Entities; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java index c3d3ac7..d13613c 100644 --- a/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java +++ b/core/src/main/java/brooklyn/entity/group/DynamicRegionsFabricImpl.java @@ -24,13 +24,13 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java b/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java index e7c6d11..1538f59 100644 --- a/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java +++ b/core/src/main/java/brooklyn/entity/group/QuarantineGroup.java @@ -19,8 +19,8 @@ package brooklyn.entity.group; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java b/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java index 4a6b75e..f3c99fd 100644 --- a/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/group/QuarantineGroupImpl.java @@ -25,6 +25,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +35,6 @@ import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java index 7b2a167..d7ad64a 100644 --- a/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java +++ b/core/src/main/java/brooklyn/entity/group/zoneaware/CriticalCauseZoneFailureDetector.java @@ -19,8 +19,7 @@ package brooklyn.entity.group.zoneaware; import org.apache.brooklyn.api.location.Location; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java b/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java index d3dc284..9436f20 100644 --- a/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java +++ b/core/src/main/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java @@ -19,8 +19,7 @@ package brooklyn.entity.group.zoneaware; import org.apache.brooklyn.api.location.Location; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Ticker; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java index 8946bb6..680b4a5 100644 --- a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java +++ b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java @@ -29,11 +29,10 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntityTypeRegistry; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java index eb601ed..0960ca5 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java @@ -36,23 +36,23 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.AggregateClassLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.AggregateClassLoader; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java index 8517664..b8fa07c 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalFactory.java @@ -24,10 +24,9 @@ import java.lang.reflect.InvocationTargetException; import java.util.Map; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.Reflections; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java index 464d2a4..a543222 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java @@ -25,17 +25,14 @@ import java.util.Map.Entry; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.FlagUtils; - -import brooklyn.config.ConfigKey; - import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java index c174dcb..6f78ec7 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java @@ -26,15 +26,15 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; /** * Creates policies of required types. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java index aed26d4..302560d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java @@ -23,12 +23,12 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.mementos.Memento; import org.apache.brooklyn.api.policy.EntityAdjunct; import org.apache.brooklyn.core.policy.basic.AbstractEntityAdjunct.AdjunctTagSupport; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.AbstractBrooklynObject; + import brooklyn.entity.rebind.dto.MementosGenerators; -import brooklyn.util.text.Strings; public abstract class AbstractBrooklynObjectRebindSupport<T extends Memento> implements RebindSupport<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java index f0a0d25..455bea8 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java @@ -36,14 +36,14 @@ import org.apache.brooklyn.api.mementos.Memento; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData.Builder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynObjectInternal; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableSet; + import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.entity.rebind.transformer.CompoundTransformer; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableSet; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java index 6ee5eb2..cc0bd5b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java @@ -22,11 +22,10 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.mementos.CatalogItemMemento; import org.apache.brooklyn.core.catalog.internal.CatalogItemDtoAbstract; import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableMap; - public class BasicCatalogItemRebindSupport extends AbstractBrooklynObjectRebindSupport<CatalogItemMemento> { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java index f059a83..f4935c1 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java @@ -31,18 +31,18 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.event.feed.AbstractFeed; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java index 7f1f286..bb9d225 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java @@ -26,17 +26,16 @@ import java.util.NoSuchElementException; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.dto.MementosGenerators; import org.apache.brooklyn.location.basic.AbstractLocation; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java index 8c5eed2..d6e61a6 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -30,13 +30,13 @@ import org.apache.brooklyn.core.management.internal.BrooklynObjectManagementMode import org.apache.brooklyn.core.management.internal.EntityManagerInternal; import org.apache.brooklyn.core.management.internal.LocationManagerInternal; import org.apache.brooklyn.core.management.internal.ManagementTransitionMode; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; -import brooklyn.util.text.Strings; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java index 3cba730..cedc20b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -29,9 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynObjectInternal; - import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; @@ -48,18 +46,18 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.util.task.ScheduledTask; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java index 3fb0a75..c07e469 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java @@ -25,11 +25,10 @@ import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.Sets; public class PersistenceExceptionHandlerImpl implements PersistenceExceptionHandler { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java index 963e670..ae155dc 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -34,8 +34,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java index 49138a3..8669312 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java @@ -39,11 +39,10 @@ import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java index 368fc09..77a90c5 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -32,10 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.AbstractBrooklynObject; import org.apache.brooklyn.basic.BrooklynObjectInternal; - import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; @@ -92,15 +90,14 @@ import brooklyn.event.feed.AbstractFeed; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +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.guava.Maybe; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Optional; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java index f810a98..a758c99 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -43,17 +43,24 @@ import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.api.mementos.TreeNode; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.ScheduledTask; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -62,13 +69,6 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils.CreateBackupMode; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.entity.rebind.transformer.CompoundTransformer; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java index 204148d..4a80491 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java @@ -34,9 +34,9 @@ import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynTypes; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; + import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Sanitizer;
