http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 3ef42f7..27beeaf 100644 --- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java +++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java @@ -20,16 +20,17 @@ package brooklyn.entity.proxying; import java.util.Map; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.Feed; import brooklyn.entity.basic.AbstractEntity; import brooklyn.management.ManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 273d3ec..ff1975e 100644 --- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObject; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.mementos.Memento; -import brooklyn.policy.EntityAdjunct; import brooklyn.policy.basic.AbstractEntityAdjunct.AdjunctTagSupport; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java index a363c3e..f7e4417 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java @@ -23,7 +23,11 @@ import java.util.Map; import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; @@ -34,8 +38,6 @@ import brooklyn.mementos.EntityMemento; import brooklyn.mementos.LocationMemento; import brooklyn.mementos.Memento; import brooklyn.mementos.PolicyMemento; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 6a0eac5..6833f08 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -32,7 +32,11 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.entity.basic.BrooklynTaskTags; @@ -44,8 +48,6 @@ import brooklyn.location.Location; import brooklyn.management.ExecutionContext; import brooklyn.management.Task; import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 3dee58d..98b046d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -24,14 +24,16 @@ import java.util.Collection; import java.util.Map; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; import brooklyn.management.ManagementContext; import brooklyn.mementos.BrooklynMementoPersister.LookupContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.collections.MutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java index 950d363..f5a9570 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -24,15 +24,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; import brooklyn.management.ManagementContext; import brooklyn.mementos.BrooklynMementoPersister.LookupContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; /** Looks in {@link RebindContext} <i>and</i> {@link ManagementContext} to find entities, locations, etc. */ public class RebindContextLookupContext implements LookupContext { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 aa448bb..261a0a7 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindExceptionHandlerImpl.java @@ -28,14 +28,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.rebind.RebindManager.RebindFailureMode; import brooklyn.location.Location; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.QuorumCheck; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/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 864fe15..7ef89d4 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -36,8 +36,12 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObject; import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; + import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.BrooklynLogging; @@ -81,8 +85,6 @@ import brooklyn.mementos.LocationMemento; import brooklyn.mementos.Memento; import brooklyn.mementos.PolicyMemento; import brooklyn.mementos.TreeNode; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java index 7c5bd87..05a346d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -27,7 +27,12 @@ import java.util.Set; import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynTypes; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EntityAdjunct; +import org.apache.brooklyn.policy.Policy; + import brooklyn.catalog.internal.CatalogItemDo; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; @@ -55,9 +60,6 @@ import brooklyn.mementos.FeedMemento; import brooklyn.mementos.LocationMemento; import brooklyn.mementos.Memento; import brooklyn.mementos.PolicyMemento; -import brooklyn.policy.Enricher; -import brooklyn.policy.EntityAdjunct; -import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java index 5ce7853..04a141b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -25,7 +25,11 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; import brooklyn.entity.Entity; @@ -50,8 +54,6 @@ import brooklyn.management.internal.LocalLocationManager; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.mementos.Memento; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java index 6fdf549..d03fed5 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -31,7 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObjectSpec; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.catalog.internal.CatalogBundleDto; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Effector; @@ -59,8 +63,6 @@ import brooklyn.management.classloading.BrooklynClassLoadingContextSequential; import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; import brooklyn.mementos.BrooklynMementoPersister.LookupContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; import brooklyn.util.xstream.XmlSerializer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java b/core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java index 9a96e98..aac7dc8 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java +++ b/core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java @@ -20,9 +20,10 @@ package brooklyn.location.basic; import java.util.Map; +import org.apache.brooklyn.policy.EnricherType; + import brooklyn.basic.BrooklynTypeSnapshot; import brooklyn.config.ConfigKey; -import brooklyn.policy.EnricherType; public class LocationTypeSnapshot extends BrooklynTypeSnapshot implements EnricherType { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java index 9828844..d72d0c7 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java +++ b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java @@ -18,12 +18,13 @@ */ package brooklyn.management.internal; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; + import brooklyn.config.ConfigKey; import brooklyn.entity.Effector; import brooklyn.entity.Feed; import brooklyn.event.AttributeSensor; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; public interface EntityChangeListener { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java index 7b59c83..1516e0f 100644 --- a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java +++ b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java @@ -23,6 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +45,6 @@ import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; import brooklyn.management.internal.NonDeploymentManagementContext.NonDeploymentManagementContextMode; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.util.exceptions.Exceptions; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java index ac8446e..8051aeb 100644 --- a/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/LocalEntityManager.java @@ -32,6 +32,10 @@ import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,10 +59,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.internal.storage.BrooklynStorage; import brooklyn.management.AccessController; import brooklyn.management.Task; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.util.collections.MutableSet; import brooklyn.util.collections.SetFromLiveMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java index 281a3a4..43760b6 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentEntityManager.java @@ -22,15 +22,16 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.entity.Application; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.EntityTypeRegistry; import brooklyn.management.ManagementContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java index bdf1d70..ba30f53 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.management.SubscriptionContext; import brooklyn.management.SubscriptionHandle; import brooklyn.management.Task; import brooklyn.management.internal.SubscriptionTracker; -import brooklyn.policy.EntityAdjunct; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java b/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java index 44d3646..decf0f5 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java @@ -22,6 +22,8 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicyType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,8 +31,6 @@ import brooklyn.entity.rebind.BasicPolicyRebindSupport; import brooklyn.entity.rebind.RebindSupport; import brooklyn.entity.trait.Configurable; import brooklyn.mementos.PolicyMemento; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicyType; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/AdjunctType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AdjunctType.java b/core/src/main/java/brooklyn/policy/basic/AdjunctType.java index 3ac9c69..1be4dc4 100644 --- a/core/src/main/java/brooklyn/policy/basic/AdjunctType.java +++ b/core/src/main/java/brooklyn/policy/basic/AdjunctType.java @@ -25,12 +25,12 @@ import java.util.Collections; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.policy.EntityAdjunct; import com.google.common.base.Joiner; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/Policies.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/Policies.java b/core/src/main/java/brooklyn/policy/basic/Policies.java index 2e55a63..d493a4b 100644 --- a/core/src/main/java/brooklyn/policy/basic/Policies.java +++ b/core/src/main/java/brooklyn/policy/basic/Policies.java @@ -18,6 +18,8 @@ */ package brooklyn.policy.basic; +import org.apache.brooklyn.policy.Policy; + import groovy.lang.Closure; import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityLocal; @@ -25,7 +27,6 @@ import brooklyn.entity.basic.Lifecycle; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; @SuppressWarnings({"rawtypes","unchecked"}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/PolicyDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/PolicyDynamicType.java b/core/src/main/java/brooklyn/policy/basic/PolicyDynamicType.java index 6beeda6..3008e2a 100644 --- a/core/src/main/java/brooklyn/policy/basic/PolicyDynamicType.java +++ b/core/src/main/java/brooklyn/policy/basic/PolicyDynamicType.java @@ -18,9 +18,10 @@ */ package brooklyn.policy.basic; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicyType; + import brooklyn.basic.BrooklynDynamicType; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicyType; public class PolicyDynamicType extends BrooklynDynamicType<Policy, AbstractPolicy> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/main/java/brooklyn/policy/basic/PolicyTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/PolicyTypeSnapshot.java b/core/src/main/java/brooklyn/policy/basic/PolicyTypeSnapshot.java index ed36adb..4eef80c 100644 --- a/core/src/main/java/brooklyn/policy/basic/PolicyTypeSnapshot.java +++ b/core/src/main/java/brooklyn/policy/basic/PolicyTypeSnapshot.java @@ -20,9 +20,10 @@ package brooklyn.policy.basic; import java.util.Map; +import org.apache.brooklyn.policy.PolicyType; + import brooklyn.basic.BrooklynTypeSnapshot; import brooklyn.config.ConfigKey; -import brooklyn.policy.PolicyType; public class PolicyTypeSnapshot extends BrooklynTypeSnapshot implements PolicyType { private static final long serialVersionUID = 4670930188951106009L; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/enricher/EnrichersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/EnrichersTest.java b/core/src/test/java/brooklyn/enricher/EnrichersTest.java index dbf544f..5b21615 100644 --- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java +++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java @@ -32,13 +32,13 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityAdjuncts; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.basic.Sensors; -import brooklyn.policy.Enricher; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.CollectionFunctionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java index 5bca552..ded18f3 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import brooklyn.policy.EnricherSpec; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java index 4e33f6d..7c8f0e5 100644 --- a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import java.util.Map; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; import org.testng.Assert; import org.testng.annotations.Test; @@ -33,8 +35,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestApplicationNoEnrichersImpl; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java index 45b7ec3..4d84f22 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.management.SubscriptionContext; -import brooklyn.policy.EnricherSpec; import brooklyn.util.time.Duration; public class YamlRollingTimeWindowMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java index 2a7a974..6637eba 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.management.SubscriptionContext; -import brooklyn.policy.EnricherSpec; public class YamlTimeWeightedDeltaEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java index da0c983..7ffecf5 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java @@ -21,6 +21,10 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,10 +35,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicConfigKey; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java index 279c2c7..32d1f5a 100644 --- a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java @@ -25,6 +25,9 @@ import static org.testng.Assert.fail; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.TestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,9 +36,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityNoEnrichersImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java index 256cd99..afa4eaa 100644 --- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.policy.Enricher; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import brooklyn.util.collections.QuorumCheck.QuorumChecks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java index b1a51a0..95f3680 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.Assert; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index c9d2552..616303d 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.event.Sensor; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.EntityManager; -import brooklyn.policy.PolicySpec; import brooklyn.test.Asserts; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java index cf30366..1a4b82e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -26,6 +26,8 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +48,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index c522b59..5b0710b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -27,6 +27,10 @@ import java.io.File; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.Assert; import org.testng.annotations.Test; @@ -46,10 +50,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.management.EntityManager; import brooklyn.management.ManagementContext; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java index 1f073ed..7e1345f 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -25,6 +25,9 @@ import static org.testng.Assert.assertTrue; import java.util.Map; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; @@ -39,9 +42,6 @@ import brooklyn.entity.rebind.RebindEnricherTest.MyEnricher; import brooklyn.location.Location; import brooklyn.location.basic.Locations; import brooklyn.mementos.BrooklynMementoManifest; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 9c608f2..25a218f 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; import org.testng.SkipException; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -46,8 +48,6 @@ import brooklyn.management.ManagementContext; import brooklyn.mementos.BrooklynMemento; import brooklyn.mementos.BrooklynMementoPersister; import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index 36e7b7c..d3bafd9 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -31,6 +31,9 @@ import java.util.NoSuchElementException; import java.util.Set; import brooklyn.management.osgi.OsgiTestResources; + +import org.apache.brooklyn.policy.Enricher; +import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +41,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; + import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogItemDtoAbstract; import brooklyn.catalog.internal.CatalogTestUtils; @@ -53,8 +58,6 @@ import brooklyn.location.LocationSpec; import brooklyn.management.ManagementContext; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; import brooklyn.mementos.BrooklynMementoPersister.LookupContext; -import brooklyn.policy.Enricher; -import brooklyn.policy.Policy; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java index 8659351..3360290 100644 --- a/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/brooklyn/management/osgi/OsgiVersionMoreEntityTest.java @@ -33,7 +33,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; + import brooklyn.catalog.internal.CatalogEntityItemDto; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogItemDtoAbstract; @@ -49,8 +51,10 @@ import brooklyn.management.ManagementContext; import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.policy.PolicySpec; + +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.TestResourceUnavailableException; + import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java b/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java index 89872be..02d294c 100644 --- a/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java +++ b/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertEquals; import java.util.Map; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.PolicySpec; import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/policy/basic/EnricherTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/policy/basic/EnricherTypeTest.java b/core/src/test/java/brooklyn/policy/basic/EnricherTypeTest.java index ec8525a..f190c61 100644 --- a/core/src/test/java/brooklyn/policy/basic/EnricherTypeTest.java +++ b/core/src/test/java/brooklyn/policy/basic/EnricherTypeTest.java @@ -20,13 +20,13 @@ package brooklyn.policy.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherType; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.EnricherType; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/policy/basic/PolicyTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/policy/basic/PolicyTypeTest.java b/core/src/test/java/brooklyn/policy/basic/PolicyTypeTest.java index 9b17ecf..75b50fd 100644 --- a/core/src/test/java/brooklyn/policy/basic/PolicyTypeTest.java +++ b/core/src/test/java/brooklyn/policy/basic/PolicyTypeTest.java @@ -20,12 +20,12 @@ package brooklyn.policy.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.PolicyType; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.policy.PolicyType; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java index 1d54bc8..ffccb3a 100644 --- a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java @@ -22,6 +22,8 @@ import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.PerformanceTestUtils; import org.testng.annotations.Test; @@ -29,8 +31,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.policy.Policy; -import brooklyn.policy.PolicySpec; import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java index 50674e5..782d15c 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java @@ -24,7 +24,6 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.catalog.Catalog; import org.apache.brooklyn.catalog.CatalogConfig; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; @@ -53,11 +52,13 @@ import brooklyn.entity.webapp.tomcat.TomcatServer; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.DependentConfiguration; + import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceReplacer; import brooklyn.policy.ha.ServiceRestarter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java index 94f824d..05f528b 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/HighAvailabilityCassandraCluster.java @@ -31,9 +31,11 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntitySpec; + import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.PolicySpec; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceReplacer; import brooklyn.policy.ha.ServiceRestarter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java index 555f13c..5179c0e 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/RiakClusterExample.java @@ -31,9 +31,11 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntitySpec; + import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.PolicySpec; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceRestarter; import brooklyn.util.CommandLineUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java index 89a1fa3..c57052e 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/WideAreaCassandraCluster.java @@ -33,9 +33,11 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.proxying.EntitySpec; + import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.PolicySpec; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceReplacer; import brooklyn.policy.ha.ServiceRestarter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index 726d36e..8ebdd12 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.demo; import org.apache.brooklyn.demo.WebClusterDatabaseExampleApp; +import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.WebAppMonitor; @@ -56,7 +57,6 @@ import brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import brooklyn.entity.webapp.DynamicWebAppCluster; import brooklyn.entity.webapp.tomcat.Tomcat8Server; import brooklyn.location.Location; -import brooklyn.policy.Enricher; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java index 93e5c11..bb2e22f 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java @@ -18,6 +18,7 @@ */ package brooklyn.policy.os; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; @@ -25,7 +26,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.WinRmMachineLocation; -import brooklyn.policy.PolicySpec; import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java index eaa8b2f..f3e66c0 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.policy.PolicySpec; import brooklyn.policy.os.CreateUserPolicy; import brooklyn.test.entity.TestEntity; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java index 833214e..cdfc7be 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.policy.PolicySpec; import brooklyn.policy.os.CreateUserPolicy; import brooklyn.test.entity.TestEntity; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java index 681287f..fea75a9 100644 --- a/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -32,8 +32,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.catalog.Catalog; +import org.apache.brooklyn.policy.PolicySpec; + import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.BrooklynTaskTags; @@ -47,7 +48,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.policy.PolicySpec; import brooklyn.policy.autoscaling.SizeHistory.WindowSummary; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.policy.loadbalancing.LoadBalancingPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java index cc2ab3a..ba16cca 100644 --- a/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java +++ b/policy/src/main/java/brooklyn/policy/ha/ConditionalSuspendPolicy.java @@ -18,6 +18,7 @@ */ package brooklyn.policy.ha; +import org.apache.brooklyn.policy.Policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; -import brooklyn.policy.Policy; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java index 1885e9a..63c7611 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -44,7 +45,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Resizable; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.policy.PolicySpec; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestCluster; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java index e72b360..fa02438 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ConnectionFailureDetectorTest.java @@ -28,6 +28,7 @@ import java.net.ServerSocket; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.management.ManagementContext; -import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java index 0cccf14..31a5bd0 100644 --- a/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/HaPolicyRebindTest.java @@ -25,6 +25,8 @@ import static org.testng.Assert.fail; import java.util.List; import java.util.Set; +import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,8 +43,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.policy.EnricherSpec; -import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java index 4cf365e..bb91fde 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.fail; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -40,7 +41,6 @@ import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.management.ManagementContext; -import brooklyn.policy.EnricherSpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java index f8c80bc..60f7dd8 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import brooklyn.event.Sensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.management.ManagementContext; -import brooklyn.policy.EnricherSpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java index b1bd375..43a31c7 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.ManagementContext; -import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java index 0d27b0c..93a2fa3 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceRestarterTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.policy.PolicySpec; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,7 +40,6 @@ import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.management.ManagementContext; -import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; import brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java index feb506a..1fe7fac 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -30,6 +30,7 @@ import java.util.TimerTask; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.location.basic.LocationConfigKeys; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.cloud.CloudLocationConfig; import brooklyn.management.Task; -import brooklyn.policy.EnricherSpec; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java index 9ca8f74..1069cd6 100644 --- a/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java +++ b/software/base/src/main/java/brooklyn/entity/pool/ServerPoolImpl.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import brooklyn.location.basic.Machines; import brooklyn.location.dynamic.DynamicLocation; import brooklyn.management.LocationManager; import brooklyn.management.Task; -import brooklyn.policy.PolicySpec; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java index 6586bb1..fe6650b 100644 --- a/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java +++ b/software/base/src/main/java/brooklyn/entity/service/InitdServiceInstaller.java @@ -23,6 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.File; import java.util.Map; +import org.apache.brooklyn.policy.Enricher; + import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; @@ -34,7 +36,6 @@ import brooklyn.entity.trait.HasShortName; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.cloud.names.AbstractCloudMachineNamer; import brooklyn.management.Task; -import brooklyn.policy.Enricher; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java index e47e375..5d6e55a 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceEnricher.java @@ -20,6 +20,8 @@ package brooklyn.entity.service; import java.util.Set; +import org.apache.brooklyn.policy.Enricher; + import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.Entity; @@ -34,7 +36,6 @@ import brooklyn.entity.effector.EffectorTasks; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.ExecutionContext; import brooklyn.management.Task; -import brooklyn.policy.Enricher; import brooklyn.util.net.Urls; import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstallerFactory.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstallerFactory.java b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstallerFactory.java index 08da83a..b89c195 100644 --- a/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstallerFactory.java +++ b/software/base/src/main/java/brooklyn/entity/service/SystemServiceInstallerFactory.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.service; +import org.apache.brooklyn.policy.Enricher; + import brooklyn.entity.Entity; -import brooklyn.policy.Enricher; public class SystemServiceInstallerFactory { public static SystemServiceInstaller of(Entity entity, Enricher systemServiceEnricher) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java index 6436fa9..52a575c 100644 --- a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java +++ b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.service; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherSpec; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,7 +36,6 @@ import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.policy.EnricherSpec; import brooklyn.test.Asserts; import brooklyn.util.ssh.BashCommands; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java index 629e933..d6afbc4 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -49,7 +49,7 @@ import brooklyn.util.time.Duration; * <ul> * <li>a {@link brooklyn.entity.group.DynamicCluster} of {@link KafkaBroker}s * <li>a {@link KafkaZookeeper} or {@link Zookeeper} - * <li>a {@link brooklyn.policy.Policy} to resize the broker cluster + * <li>a {@link org.apache.brooklyn.policy.Policy} to resize the broker cluster * </ul> * The {@link Group group} and {@link Resizable} interface methods are delegated to the broker cluster, so calling * {@link Resizable#resize(Integer) resize} will change the number of brokers. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java index 511bb6b..4bdd9aa 100644 --- a/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/zookeeper/ZooKeeperEnsembleImpl.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.group.DynamicClusterImpl; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.policy.PolicySpec; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java ---------------------------------------------------------------------- diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java index 05d0787..ac9fab5 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerImpl.java @@ -25,6 +25,7 @@ import java.io.StringReader; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +59,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.Sensor; import brooklyn.location.basic.Machines; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.policy.PolicySpec; import brooklyn.util.guava.Maybe; import brooklyn.util.net.Cidr; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java index 4369123..e9adbe0 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.network.bind; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; -import brooklyn.policy.EnricherSpec; import brooklyn.test.entity.TestApplication; public class BindDnsServerIntegrationTest extends RebindTestFixture<TestApplication> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java index d6a095c..ec6535b 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.network.bind; import static org.apache.brooklyn.test.EntityTestUtils.assertAttributeEqualsEventually; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.policy.EnricherSpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.policy.EnricherSpec; import brooklyn.test.entity.TestApplication; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java index baa9a17..9ddd137 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java @@ -28,6 +28,7 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +49,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.Location; import brooklyn.location.basic.Machines; -import brooklyn.policy.PolicySpec; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java index bce7cac..aff7662 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.Location; -import brooklyn.policy.PolicySpec; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e3c230/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java index f279987..2f06fac 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; +import org.apache.brooklyn.policy.PolicySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; import brooklyn.location.access.BrooklynAccessUtils; -import brooklyn.policy.PolicySpec; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableSet; import brooklyn.util.collections.QuorumCheck;
