http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java index 9734f25..c7c9346 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java @@ -32,10 +32,9 @@ 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 brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.guava.Maybe; /** * The basic interface for a Brooklyn entity.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java index 42548a2..b4a293a 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java @@ -23,8 +23,7 @@ import java.util.Set; import org.apache.brooklyn.api.basic.BrooklynType; import org.apache.brooklyn.api.event.Sensor; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; /** * Gives type information for an {@link Entity}. It is an immutable snapshot. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java b/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java index f16d867..d351ecc 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java @@ -31,10 +31,9 @@ import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.SubscriptionManager; import org.apache.brooklyn.api.management.Task; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/entity/proxying/EntitySpec.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/proxying/EntitySpec.java b/api/src/main/java/org/apache/brooklyn/api/entity/proxying/EntitySpec.java index aa7113b..7f5346e 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/proxying/EntitySpec.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/proxying/EntitySpec.java @@ -36,13 +36,12 @@ 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.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.collections.MutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.collections.MutableList; - import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/entity/rebind/RebindManager.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/rebind/RebindManager.java b/api/src/main/java/org/apache/brooklyn/api/entity/rebind/RebindManager.java index a47faca..dd1ff9e 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/rebind/RebindManager.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/rebind/RebindManager.java @@ -28,8 +28,7 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; - -import brooklyn.util.time.Duration; +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/api/src/main/java/org/apache/brooklyn/api/entity/trait/Configurable.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/trait/Configurable.java b/api/src/main/java/org/apache/brooklyn/api/entity/trait/Configurable.java index 9a7680f..65bd7f2 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/trait/Configurable.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/trait/Configurable.java @@ -19,9 +19,8 @@ package org.apache.brooklyn.api.entity.trait; import org.apache.brooklyn.api.management.Task; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/location/Location.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/location/Location.java b/api/src/main/java/org/apache/brooklyn/api/location/Location.java index 0d05556..397a9a0 100644 --- a/api/src/main/java/org/apache/brooklyn/api/location/Location.java +++ b/api/src/main/java/org/apache/brooklyn/api/location/Location.java @@ -23,9 +23,8 @@ import java.util.Collection; import java.util.Map; import org.apache.brooklyn.api.basic.BrooklynObject; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; /** * A location that an entity can be in. Examples of locations include a single machine http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/location/LocationRegistry.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/location/LocationRegistry.java b/api/src/main/java/org/apache/brooklyn/api/location/LocationRegistry.java index b3c3e5a..50fbc6a 100644 --- a/api/src/main/java/org/apache/brooklyn/api/location/LocationRegistry.java +++ b/api/src/main/java/org/apache/brooklyn/api/location/LocationRegistry.java @@ -24,7 +24,7 @@ import java.util.NoSuchElementException; import javax.annotation.Nullable; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java b/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java index 8164ab0..bf58fe4 100644 --- a/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java +++ b/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java @@ -25,12 +25,11 @@ import java.util.Map; import org.apache.brooklyn.api.basic.AbstractBrooklynObjectSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; - import com.google.common.collect.Maps; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java b/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java index 44c8e23..7483ec5 100644 --- a/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java +++ b/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.api.location; import java.net.InetAddress; -import brooklyn.util.net.HasNetworkAddresses; +import org.apache.brooklyn.util.net.HasNetworkAddresses; /** * A location that is a machine. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/ManagementContext.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/ManagementContext.java b/api/src/main/java/org/apache/brooklyn/api/management/ManagementContext.java index 84085fc..0d85e2d 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/ManagementContext.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/ManagementContext.java @@ -33,9 +33,8 @@ import org.apache.brooklyn.api.entity.rebind.RebindManager; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; - -import brooklyn.config.StringConfigMap; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/Task.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/Task.java b/api/src/main/java/org/apache/brooklyn/api/management/Task.java index 37df354..c4c3a2e 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/Task.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/Task.java @@ -25,9 +25,9 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeoutException; -import com.google.common.util.concurrent.ListenableFuture; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.util.time.Duration; +import com.google.common.util.concurrent.ListenableFuture; /** * Represents a unit of work for execution. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/TaskQueueingContext.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/TaskQueueingContext.java b/api/src/main/java/org/apache/brooklyn/api/management/TaskQueueingContext.java index 14304a3..ac59842 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/TaskQueueingContext.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/TaskQueueingContext.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.api.management; import java.util.List; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/classloading/BrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/classloading/BrooklynClassLoadingContext.java b/api/src/main/java/org/apache/brooklyn/api/management/classloading/BrooklynClassLoadingContext.java index 159ac96..c467004 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/classloading/BrooklynClassLoadingContext.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/classloading/BrooklynClassLoadingContext.java @@ -23,8 +23,7 @@ import java.net.URL; import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ManagementContext; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; /** * Provides functionality for loading classes based on the current context http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementNodeState.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementNodeState.java b/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementNodeState.java index 039d0db..ec75810 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementNodeState.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementNodeState.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.api.management.ha; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; public enum ManagementNodeState { /** Node is either coming online, or is in some kind of recovery/transitioning mode */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementPlaneSyncRecordPersister.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementPlaneSyncRecordPersister.java b/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementPlaneSyncRecordPersister.java index 9dfb44e..1976cdd 100644 --- a/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementPlaneSyncRecordPersister.java +++ b/api/src/main/java/org/apache/brooklyn/api/management/ha/ManagementPlaneSyncRecordPersister.java @@ -23,8 +23,7 @@ import java.util.Collection; import java.util.concurrent.TimeoutException; import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; - -import brooklyn.util.time.Duration; +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/api/src/main/java/org/apache/brooklyn/api/mementos/BrooklynMementoPersister.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mementos/BrooklynMementoPersister.java b/api/src/main/java/org/apache/brooklyn/api/mementos/BrooklynMementoPersister.java index ff94a68..3ae7ba1 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mementos/BrooklynMementoPersister.java +++ b/api/src/main/java/org/apache/brooklyn/api/mementos/BrooklynMementoPersister.java @@ -37,8 +37,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; - -import brooklyn.util.time.Duration; +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/api/src/main/java/org/apache/brooklyn/api/mementos/EntityMemento.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mementos/EntityMemento.java b/api/src/main/java/org/apache/brooklyn/api/mementos/EntityMemento.java index f45e0eb..69280c5 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mementos/EntityMemento.java +++ b/api/src/main/java/org/apache/brooklyn/api/mementos/EntityMemento.java @@ -25,8 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.event.AttributeSensor; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; /** * Represents the state of an entity, so that it can be reconstructed (e.g. after restarting brooklyn). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/policy/Enricher.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/Enricher.java b/api/src/main/java/org/apache/brooklyn/api/policy/Enricher.java index 1da1ace..b3016db 100644 --- a/api/src/main/java/org/apache/brooklyn/api/policy/Enricher.java +++ b/api/src/main/java/org/apache/brooklyn/api/policy/Enricher.java @@ -24,8 +24,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.rebind.Rebindable; import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.mementos.EnricherMemento; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/policy/EnricherSpec.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/EnricherSpec.java b/api/src/main/java/org/apache/brooklyn/api/policy/EnricherSpec.java index 6cdc742..83bc2b9 100644 --- a/api/src/main/java/org/apache/brooklyn/api/policy/EnricherSpec.java +++ b/api/src/main/java/org/apache/brooklyn/api/policy/EnricherSpec.java @@ -25,12 +25,11 @@ import java.util.Map; import org.apache.brooklyn.api.basic.AbstractBrooklynObjectSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; - import com.google.common.collect.Maps; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java index 92b57b2..eb2a2f1 100644 --- a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java +++ b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java @@ -24,8 +24,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.rebind.Rebindable; import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.mementos.PolicyMemento; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java b/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java index 3e13db6..926153b 100644 --- a/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java +++ b/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java @@ -25,12 +25,11 @@ import java.util.Map; import org.apache.brooklyn.api.basic.AbstractBrooklynObjectSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; - import com.google.common.collect.Maps; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/AbstractResource.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/AbstractResource.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/AbstractResource.java index 0a01d45..56a51f4 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/AbstractResource.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/AbstractResource.java @@ -24,10 +24,9 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.camp.commontypes.RepresentationSkew; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Identifiers; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.time.Time; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java index 38405c2..408823e 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java @@ -23,8 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.camp.spi.AbstractResource; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class BasicResourceLookup<T extends AbstractResource> extends AbstractResourceLookup<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Artifact.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Artifact.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Artifact.java index 5ea2a6a..e462f45 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Artifact.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Artifact.java @@ -22,11 +22,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.yaml.Yamls; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.yaml.Yamls; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactContent.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactContent.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactContent.java index e1f093f..8817a23 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactContent.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactContent.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.camp.spi.pdp; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableMap; public class ArtifactContent { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactRequirement.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactRequirement.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactRequirement.java index 10ad72c..6b97a46 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactRequirement.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ArtifactRequirement.java @@ -20,11 +20,10 @@ package org.apache.brooklyn.camp.spi.pdp; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.yaml.Yamls; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.yaml.Yamls; - import com.google.common.collect.ImmutableMap; public class ArtifactRequirement { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java index 499a4ee..792392e 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java @@ -22,11 +22,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Service.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Service.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Service.java index 8c05143..af15ddf 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Service.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/Service.java @@ -22,11 +22,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.yaml.Yamls; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.yaml.Yamls; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ServiceCharacteristic.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ServiceCharacteristic.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ServiceCharacteristic.java index bf8009b..5ab12e1 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ServiceCharacteristic.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/ServiceCharacteristic.java @@ -20,11 +20,10 @@ package org.apache.brooklyn.camp.spi.pdp; import java.util.Map; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.yaml.Yamls; import org.apache.commons.lang3.builder.ToStringBuilder; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.yaml.Yamls; - import com.google.common.collect.ImmutableMap; public class ServiceCharacteristic { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java index 2763d93..61c0302 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpProcessor.java @@ -33,16 +33,15 @@ import org.apache.brooklyn.camp.spi.pdp.DeploymentPlan; import org.apache.brooklyn.camp.spi.pdp.Service; import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationContext; import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.yaml.Yamls; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.yaml.snakeyaml.error.YAMLException; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.yaml.Yamls; - import com.google.common.annotations.VisibleForTesting; public class PdpProcessor { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationNode.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationNode.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationNode.java index 43428ed..6542b8b 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationNode.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/interpret/PlanInterpretationNode.java @@ -21,13 +21,12 @@ package org.apache.brooklyn.camp.spi.resolve.interpret; import java.util.Map; import org.apache.brooklyn.camp.spi.resolve.PlanInterpreter; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.StringPredicates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.StringPredicates; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/main/java/org/apache/brooklyn/camp/util/yaml/Yamls.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/util/yaml/Yamls.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/util/yaml/Yamls.java index 1c2c379..1bfde6f 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/util/yaml/Yamls.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/util/yaml/Yamls.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.camp.util.yaml; -/** @deprecated since 0.7.0 use {@link brooklyn.util.yaml.Yamls} */ +/** @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.yaml.Yamls} */ @Deprecated -public class Yamls extends brooklyn.util.yaml.Yamls { +public class Yamls extends org.apache.brooklyn.util.yaml.Yamls { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java index c87641f..51dcc2f 100644 --- a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java +++ b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java @@ -23,15 +23,14 @@ import java.util.Map; import org.apache.brooklyn.camp.BasicCampPlatform; import org.apache.brooklyn.camp.spi.resolve.PlanInterpreter.PlanInterpreterAdapter; import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.yaml.Yamls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.yaml.Yamls; - @Test public class DeploymentPlanToyInterpreterTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/PdpYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/PdpYamlTest.java b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/PdpYamlTest.java index 8cb88e0..b9fee6f 100644 --- a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/PdpYamlTest.java +++ b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/spi/pdp/PdpYamlTest.java @@ -28,13 +28,12 @@ import org.apache.brooklyn.camp.spi.pdp.Artifact; import org.apache.brooklyn.camp.spi.pdp.DeploymentPlan; import org.apache.brooklyn.camp.spi.pdp.Service; import org.apache.brooklyn.camp.test.mock.web.MockWebPlatform; +import org.apache.brooklyn.util.stream.Streams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.stream.Streams; - public class PdpYamlTest { private static final Logger log = LoggerFactory.getLogger(PdpYamlTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java index 29aabd3..4a60d1c 100644 --- a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java +++ b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java @@ -31,8 +31,7 @@ import org.apache.brooklyn.camp.spi.pdp.Artifact; import org.apache.brooklyn.camp.spi.pdp.AssemblyTemplateConstructor; import org.apache.brooklyn.camp.spi.pdp.Service; import org.apache.brooklyn.camp.spi.resolve.PdpMatcher; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; public class MockWebPlatform { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/DtoCustomAttributes.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/DtoCustomAttributes.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/DtoCustomAttributes.java index ad9c5bd..0b7e320 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/DtoCustomAttributes.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/DtoCustomAttributes.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.camp.server.dto; import java.util.Map; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ResourceDto.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ResourceDto.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ResourceDto.java index 83987ff..cf5ca25 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ResourceDto.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ResourceDto.java @@ -24,8 +24,7 @@ import java.util.List; import org.apache.brooklyn.camp.commontypes.RepresentationSkew; import org.apache.brooklyn.camp.server.rest.util.DtoFactory; import org.apache.brooklyn.camp.spi.AbstractResource; - -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.time.Time; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/CampServer.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/CampServer.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/CampServer.java index 1ad931b..be2f7e9 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/CampServer.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/CampServer.java @@ -27,6 +27,8 @@ import javax.servlet.DispatcherType; import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.camp.server.rest.resource.PlatformRestResource; import org.apache.brooklyn.camp.server.rest.util.DtoFactory; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Networking; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.servlet.FilterHolder; @@ -36,9 +38,6 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Networking; - import com.google.common.base.Charsets; import com.google.common.io.Files; import com.sun.jersey.api.core.DefaultResourceConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java index f4a1c91..fc5c4fc 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/resource/AssemblyTemplateRestResource.java @@ -35,8 +35,7 @@ import org.apache.brooklyn.camp.server.dto.AssemblyTemplateDto; import org.apache.brooklyn.camp.spi.Assembly; import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.rest.apidoc.Apidoc; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.wordnik.swagger.core.ApiOperation; import com.wordnik.swagger.core.ApiParam; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampJsons.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampJsons.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampJsons.java index 7c67d81..cd61b0c 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampJsons.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampJsons.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.camp.server.rest.util; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java index b56e78e..c745053 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java @@ -46,9 +46,8 @@ import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.camp.spi.PlatformComponent; import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; import org.apache.brooklyn.camp.spi.PlatformRootSummary; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Urls; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Urls; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/BasicDtoTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/BasicDtoTest.java b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/BasicDtoTest.java index e41d544..6c5cabf 100644 --- a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/BasicDtoTest.java +++ b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/BasicDtoTest.java @@ -21,14 +21,13 @@ package org.apache.brooklyn.camp.server.dto; import java.io.IOException; import org.apache.brooklyn.camp.server.dto.DtoCustomAttributes; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/LinkDtoTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/LinkDtoTest.java b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/LinkDtoTest.java index de1508d..e326faa 100644 --- a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/LinkDtoTest.java +++ b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/dto/LinkDtoTest.java @@ -21,11 +21,10 @@ package org.apache.brooklyn.camp.server.dto; import java.io.IOException; import org.apache.brooklyn.camp.server.dto.LinkDto; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java index c085544..f283f5c 100644 --- a/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java +++ b/camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java @@ -23,15 +23,14 @@ import java.net.URL; import org.apache.brooklyn.camp.BasicCampPlatform; import org.apache.brooklyn.camp.server.rest.CampServer; import org.apache.brooklyn.camp.test.mock.web.MockWebPlatform; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.Urls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.reporters.Files; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.Urls; - import com.fasterxml.jackson.databind.ObjectMapper; public class AbstractRestResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/BrooklynVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java index bf45a99..2991e1f 100644 --- a/core/src/main/java/brooklyn/BrooklynVersion.java +++ b/core/src/main/java/brooklyn/BrooklynVersion.java @@ -48,10 +48,9 @@ import org.apache.brooklyn.core.management.classloading.OsgiBrooklynClassLoading import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.osgi.Osgis; import org.apache.brooklyn.core.util.osgi.Osgis.ManifestHelper; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; /** * Wraps the version of Brooklyn. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/BrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/BrooklynProperties.java b/core/src/main/java/brooklyn/config/BrooklynProperties.java index 921fe22..6ea8a41 100644 --- a/core/src/main/java/brooklyn/config/BrooklynProperties.java +++ b/core/src/main/java/brooklyn/config/BrooklynProperties.java @@ -33,19 +33,21 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Properties; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.os.Os; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.base.CharMatcher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/BrooklynServerConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java index b92bf76..380380e 100644 --- a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java +++ b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java @@ -26,13 +26,15 @@ import java.util.Map; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.CampPlatform; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.guava.Maybe; -import brooklyn.util.os.Os; /** Config keys for the brooklyn server */ public class BrooklynServerConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/BrooklynServerPaths.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java index 0e0a5c9..e8fb365 100644 --- a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java +++ b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java @@ -24,21 +24,21 @@ import java.util.Map; import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.text.TemplateProcessor; +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.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Time; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; - import com.google.common.base.Objects; public class BrooklynServerPaths { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java b/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java index 18307be..355079d 100644 --- a/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java +++ b/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java @@ -19,8 +19,7 @@ package brooklyn.config; import org.apache.brooklyn.api.management.ManagementContext; - -import brooklyn.util.internal.StringSystemProperty; +import org.apache.brooklyn.util.internal.StringSystemProperty; /** attributes which callers can set and a service application * (such as servlet or osgi) will pay attention to, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/ConfigPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/ConfigPredicates.java b/core/src/main/java/brooklyn/config/ConfigPredicates.java index 5599700..03c0e97 100644 --- a/core/src/main/java/brooklyn/config/ConfigPredicates.java +++ b/core/src/main/java/brooklyn/config/ConfigPredicates.java @@ -22,7 +22,8 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; -import brooklyn.util.text.WildcardGlobs; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.text.WildcardGlobs; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/ConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/ConfigUtils.java b/core/src/main/java/brooklyn/config/ConfigUtils.java index a080667..fc58f7f 100644 --- a/core/src/main/java/brooklyn/config/ConfigUtils.java +++ b/core/src/main/java/brooklyn/config/ConfigUtils.java @@ -28,13 +28,14 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/WrappedConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/WrappedConfigKey.java b/core/src/main/java/brooklyn/config/WrappedConfigKey.java index 2f97bf2..452d912 100644 --- a/core/src/main/java/brooklyn/config/WrappedConfigKey.java +++ b/core/src/main/java/brooklyn/config/WrappedConfigKey.java @@ -18,9 +18,10 @@ */ package brooklyn.config; -import com.google.common.base.Preconditions; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; +import com.google.common.base.Preconditions; public class WrappedConfigKey<T> implements HasConfigKey<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java b/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java index c648654..bb6d910 100644 --- a/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java +++ b/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java @@ -23,14 +23,14 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.Future; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigMap; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.config.ConfigMap; import brooklyn.entity.basic.ConfigMapViewWithStringKeys; import brooklyn.event.basic.StructuredConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/config/render/RendererHints.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/config/render/RendererHints.java b/core/src/main/java/brooklyn/config/render/RendererHints.java index bc04eea..8a3a10b 100644 --- a/core/src/main/java/brooklyn/config/render/RendererHints.java +++ b/core/src/main/java/brooklyn/config/render/RendererHints.java @@ -24,10 +24,10 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.util.GroovyJavaMethods; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/Enrichers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/Enrichers.java b/core/src/main/java/brooklyn/enricher/Enrichers.java index 00aa03f..65d0526 100644 --- a/core/src/main/java/brooklyn/enricher/Enrichers.java +++ b/core/src/main/java/brooklyn/enricher/Enrichers.java @@ -33,6 +33,11 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.core.util.flags.TypeCoercions; +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.text.StringPredicates; +import org.apache.brooklyn.util.text.Strings; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.enricher.basic.Aggregator; @@ -41,11 +46,6 @@ import brooklyn.enricher.basic.Joiner; import brooklyn.enricher.basic.Propagator; import brooklyn.enricher.basic.Transformer; import brooklyn.enricher.basic.UpdatingMap; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.text.StringPredicates; -import brooklyn.util.text.Strings; 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/enricher/basic/AbstractAggregator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java index 15202ae..16fb25c 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java @@ -28,15 +28,15 @@ 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.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.trait.Changeable; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; 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/enricher/basic/AbstractEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java index 651ea56..ab5b76b 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java @@ -29,10 +29,10 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.mementos.EnricherMemento; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherType; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractEntityAdjunct; import org.apache.brooklyn.core.util.flags.TypeCoercions; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java index 84db77f..965d7ca 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java @@ -31,11 +31,11 @@ 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.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java index 6635445..a1b859b 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java @@ -24,10 +24,10 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicSensorEvent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/Aggregator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java index 5512c28..4ea9b80 100644 --- a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java +++ b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java @@ -30,18 +30,18 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +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.text.StringPredicates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; -import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.StringPredicates; 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/enricher/basic/Combiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/Combiner.java b/core/src/main/java/brooklyn/enricher/basic/Combiner.java index 2d647ec..3d7cddc 100644 --- a/core/src/main/java/brooklyn/enricher/basic/Combiner.java +++ b/core/src/main/java/brooklyn/enricher/basic/Combiner.java @@ -33,14 +33,14 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicSensorEvent; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; 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/enricher/basic/EnricherTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/EnricherTypeSnapshot.java b/core/src/main/java/brooklyn/enricher/basic/EnricherTypeSnapshot.java index 547831a..a06c542 100644 --- a/core/src/main/java/brooklyn/enricher/basic/EnricherTypeSnapshot.java +++ b/core/src/main/java/brooklyn/enricher/basic/EnricherTypeSnapshot.java @@ -21,9 +21,8 @@ package brooklyn.enricher.basic; import java.util.Map; import org.apache.brooklyn.api.policy.EnricherType; - import org.apache.brooklyn.basic.BrooklynTypeSnapshot; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; public class EnricherTypeSnapshot extends BrooklynTypeSnapshot implements EnricherType { private static final long serialVersionUID = 4670930188951106009L; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/Joiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/Joiner.java b/core/src/main/java/brooklyn/enricher/basic/Joiner.java index f9e9d4e..eaa8787 100644 --- a/core/src/main/java/brooklyn/enricher/basic/Joiner.java +++ b/core/src/main/java/brooklyn/enricher/basic/Joiner.java @@ -26,16 +26,16 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.text.StringEscapes; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicSensorEvent; -import brooklyn.util.collections.MutableList; -import brooklyn.util.text.StringEscapes; -import brooklyn.util.text.Strings; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/Propagator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/Propagator.java b/core/src/main/java/brooklyn/enricher/basic/Propagator.java index f6d2ee8..ea9f0ea 100644 --- a/core/src/main/java/brooklyn/enricher/basic/Propagator.java +++ b/core/src/main/java/brooklyn/enricher/basic/Propagator.java @@ -28,16 +28,16 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ValueResolver; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java index 952aed3..a402074 100644 --- a/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java @@ -22,11 +22,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; import groovy.lang.Closure; + import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/Transformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/Transformer.java b/core/src/main/java/brooklyn/enricher/basic/Transformer.java index 705c626..21bd9fa 100644 --- a/core/src/main/java/brooklyn/enricher/basic/Transformer.java +++ b/core/src/main/java/brooklyn/enricher/basic/Transformer.java @@ -21,14 +21,14 @@ package brooklyn.enricher.basic; import static com.google.common.base.Preconditions.checkArgument; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ValueResolver; +import org.apache.brooklyn.util.collections.MutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableSet; import com.google.common.base.Function; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java index a396e6c..25ddd09 100644 --- a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java +++ b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java @@ -25,15 +25,15 @@ 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.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java b/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java index ec0f3ed..a625646 100644 --- a/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java @@ -23,10 +23,10 @@ import java.util.LinkedList; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java index f94c203..75a44f2 100644 --- a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java @@ -19,14 +19,14 @@ package brooklyn.enricher.basic; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractTransformer; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.time.Duration; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java b/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java index 79c2ef1..b66570c 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractApplication.java @@ -24,17 +24,17 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.trait.StartableMethods; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; /** * Users can extend this to define the entities in their application, and the relationships between http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/AbstractConfigurableEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractConfigurableEntityFactory.java b/core/src/main/java/brooklyn/entity/basic/AbstractConfigurableEntityFactory.java index 9ca3692..97399b5 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractConfigurableEntityFactory.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractConfigurableEntityFactory.java @@ -24,12 +24,11 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.exceptions.Exceptions; - public abstract class AbstractConfigurableEntityFactory<T extends Entity> implements ConfigurableEntityFactory<T>, Serializable { private static final Logger log = LoggerFactory.getLogger(AbstractConfigurableEntityFactory.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java index c62010c..0b52b4a 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java @@ -53,6 +53,8 @@ import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.EntityAdjunct; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.internal.BrooklynInitialization; @@ -76,8 +78,6 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.basic.AbstractBrooklynObject; import brooklyn.config.BrooklynLogging; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.config.render.RendererHints; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; @@ -90,14 +90,13 @@ import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.ConfigToAttributes; import org.apache.brooklyn.location.basic.Locations; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.SetFromLiveMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.Equals; -import brooklyn.util.text.Strings; +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.SetFromLiveMap; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.Equals; +import org.apache.brooklyn.util.text.Strings; 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/basic/AbstractGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java b/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java index 2f505e2..d69185e 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java @@ -23,13 +23,13 @@ import java.util.Collection; 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.config.ConfigKey; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import brooklyn.entity.trait.Changeable; import brooklyn.event.basic.Sensors; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; import com.google.common.base.Predicate; 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/AbstractGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java index a300f39..896f55c 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractGroupImpl.java @@ -30,11 +30,10 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.collections.SetFromLiveMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.SetFromLiveMap; - import com.google.common.base.Optional; 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/Attributes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/Attributes.java b/core/src/main/java/brooklyn/entity/basic/Attributes.java index f4ca92c..e250062 100644 --- a/core/src/main/java/brooklyn/entity/basic/Attributes.java +++ b/core/src/main/java/brooklyn/entity/basic/Attributes.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.util.net.UserAndHostAndPort; import brooklyn.config.render.RendererHints; import brooklyn.event.basic.BasicAttributeSensor; @@ -32,7 +33,6 @@ import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.net.UserAndHostAndPort; import com.google.common.annotations.Beta; 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/BasicGroup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BasicGroup.java b/core/src/main/java/brooklyn/entity/basic/BasicGroup.java index 05606af..4740f0c 100644 --- a/core/src/main/java/brooklyn/entity/basic/BasicGroup.java +++ b/core/src/main/java/brooklyn/entity/basic/BasicGroup.java @@ -19,9 +19,9 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; @ImplementedBy(BasicGroupImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/BasicStartable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BasicStartable.java b/core/src/main/java/brooklyn/entity/basic/BasicStartable.java index 7f8722f..ad85d78 100644 --- a/core/src/main/java/brooklyn/entity/basic/BasicStartable.java +++ b/core/src/main/java/brooklyn/entity/basic/BasicStartable.java @@ -23,8 +23,8 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.Locations; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/BasicStartableImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BasicStartableImpl.java b/core/src/main/java/brooklyn/entity/basic/BasicStartableImpl.java index e4a59f9..a21dd82 100644 --- a/core/src/main/java/brooklyn/entity/basic/BasicStartableImpl.java +++ b/core/src/main/java/brooklyn/entity/basic/BasicStartableImpl.java @@ -26,12 +26,12 @@ 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.location.basic.Locations; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.trait.Startable; import brooklyn.entity.trait.StartableMethods; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java index d9e4903..82a69bf 100644 --- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java +++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java @@ -19,17 +19,17 @@ package brooklyn.entity.basic; import static brooklyn.entity.basic.ConfigKeys.*; + import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.ConfigKey; import brooklyn.entity.trait.Startable; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.SshTool; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Preconditions;
