http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/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 6b233d8..d7a5c2d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.basic.BrooklynTypes; - import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Application; @@ -49,12 +48,12 @@ import org.apache.brooklyn.api.mementos.PolicyMemento; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EntityAdjunct; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogItemDo; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.FlagUtils; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.EntityDynamicType; import brooklyn.entity.basic.EntityInternal; @@ -64,8 +63,7 @@ import brooklyn.entity.rebind.persister.BrooklynPersistenceUtils; import brooklyn.event.feed.AbstractFeed; import org.apache.brooklyn.location.basic.LocationInternal; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; 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/rebind/persister/BrooklynMementoPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java index f146999..7f40300 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -48,12 +48,18 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.api.mementos.CatalogItemMemento; import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import org.apache.brooklyn.core.util.xstream.XmlUtil; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; -import brooklyn.config.ConfigKey; -import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.PeriodicDeltaChangeListener; import brooklyn.entity.rebind.PersisterDeltaImpl; @@ -61,12 +67,6 @@ import brooklyn.entity.rebind.dto.BrooklynMementoImpl; import brooklyn.entity.rebind.dto.BrooklynMementoManifestImpl; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.CompoundRuntimeException; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/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 39b6a8a..be116a3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -22,9 +22,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynObjectInternal; - import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; @@ -56,11 +54,10 @@ import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.entity.rebind.transformer.CompoundTransformerLoader; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java index 764d55f..aa4de92 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedObjectStore.java @@ -37,17 +37,17 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.os.Os.DeletionResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.io.FileUtil; -import brooklyn.util.os.Os; -import brooklyn.util.os.Os.DeletionResult; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedStoreObjectAccessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedStoreObjectAccessor.java b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedStoreObjectAccessor.java index c7622d6..5016f60 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedStoreObjectAccessor.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/FileBasedStoreObjectAccessor.java @@ -22,13 +22,12 @@ import java.io.File; import java.io.IOException; import java.util.Date; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.io.FileUtil; -import brooklyn.util.text.Strings; - import com.google.common.base.Charsets; import com.google.common.base.Objects; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceActivityMetrics.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceActivityMetrics.java b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceActivityMetrics.java index 1167ce6..97bb544 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceActivityMetrics.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceActivityMetrics.java @@ -21,9 +21,9 @@ package brooklyn.entity.rebind.persister; import java.util.List; import java.util.Map; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; public class PersistenceActivityMetrics { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java index fa11299..ff70989 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/PersistenceObjectStore.java @@ -25,8 +25,7 @@ import java.util.concurrent.locks.ReadWriteLock; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; - -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/core/src/main/java/brooklyn/entity/rebind/persister/StoreObjectAccessorLocking.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/StoreObjectAccessorLocking.java b/core/src/main/java/brooklyn/entity/rebind/persister/StoreObjectAccessorLocking.java index 033233b..ed821b0 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/StoreObjectAccessorLocking.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/StoreObjectAccessorLocking.java @@ -27,10 +27,11 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; /** Wraps access to an object (the delegate {@link StoreObjectAccessor} * in a guarded read-write context such that callers will be blocked if another thread http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/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 6ff75e5..3e5e3b1 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -48,6 +48,8 @@ import org.apache.brooklyn.core.management.classloading.BrooklynClassLoadingCont import org.apache.brooklyn.core.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext; import org.apache.brooklyn.core.util.xstream.XmlSerializer; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.effector.EffectorAndBody; @@ -62,8 +64,6 @@ import brooklyn.entity.rebind.dto.BasicPolicyMemento; import brooklyn.entity.rebind.dto.MutableBrooklynMemento; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java b/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java index a6f8766..e77050d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java +++ b/core/src/main/java/brooklyn/entity/rebind/plane/dto/BasicManagementNodeSyncRecord.java @@ -23,11 +23,11 @@ import java.net.URI; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; +import org.apache.brooklyn.util.time.Time; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import brooklyn.BrooklynVersion; -import brooklyn.util.time.Time; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java b/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java index 920f402..37a79f2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/plane/dto/ManagementPlaneSyncRecordImpl.java @@ -26,8 +26,7 @@ import java.util.Map; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Objects; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java index 030cd53..730c46e 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java @@ -28,11 +28,11 @@ import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.text.TemplateProcessor; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java index b36328c..dd39a13 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoader.java @@ -24,12 +24,12 @@ import java.util.Map.Entry; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.text.TemplateProcessor; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.yaml.Yamls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.rebind.transformer.CompoundTransformer.Builder; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.yaml.Yamls; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java index 0a46af7..5a0076b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java @@ -25,12 +25,12 @@ import java.util.Set; import org.apache.brooklyn.api.mementos.BrooklynMemento; import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; import brooklyn.entity.rebind.dto.BrooklynMementoImpl; import brooklyn.entity.rebind.transformer.BrooklynMementoTransformer; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; import com.google.common.annotations.Beta; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/trait/Startable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/trait/Startable.java b/core/src/main/java/brooklyn/entity/trait/Startable.java index dad2152..292be7c 100644 --- a/core/src/main/java/brooklyn/entity/trait/Startable.java +++ b/core/src/main/java/brooklyn/entity/trait/Startable.java @@ -23,12 +23,12 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/entity/trait/StartableMethods.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java index 0e14058..44a0cb0 100644 --- a/core/src/main/java/brooklyn/entity/trait/StartableMethods.java +++ b/core/src/main/java/brooklyn/entity/trait/StartableMethods.java @@ -29,14 +29,14 @@ import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskTags; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.effector.Effectors; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.CompoundRuntimeException; 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/event/basic/AbstractCollectionConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java b/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java index a1ad815..4179fca 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractCollectionConfigKey.java @@ -24,13 +24,12 @@ import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.text.Identifiers; - import com.google.common.collect.Iterables; public abstract class AbstractCollectionConfigKey<T, RawT extends Collection<Object>, V> extends AbstractStructuredConfigKey<T, RawT, V> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java b/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java index c945049..dd566d4 100644 --- a/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AbstractStructuredConfigKey.java @@ -22,9 +22,8 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.management.ExecutionContext; - -import brooklyn.config.ConfigKey; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/AttributeMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AttributeMap.java b/core/src/main/java/brooklyn/event/basic/AttributeMap.java index 281adfd..1877a6c 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeMap.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeMap.java @@ -27,12 +27,12 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.util.guava.Maybe; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java index f9cec48..1b2194b 100644 --- a/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/AttributeSensorAndConfigKey.java @@ -22,18 +22,18 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.util.exceptions.Exceptions; /** * A {@link Sensor} describing an attribute that can be configured with inputs that are used to derive the final value. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java index 0be4867..76cfd5c 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicAttributeSensorAndConfigKey.java @@ -21,11 +21,10 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; - /** * A {@link Sensor} describing an attribute that can be configured with a default value. * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java index f3b9204..75a74d5 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/BasicConfigKey.java @@ -28,16 +28,15 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.TypeTokens; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.TypeTokens; - import com.google.common.annotations.Beta; import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/BasicSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/BasicSensor.java b/core/src/main/java/brooklyn/event/basic/BasicSensor.java index 4c78dfa..7aee6fb 100644 --- a/core/src/main/java/brooklyn/event/basic/BasicSensor.java +++ b/core/src/main/java/brooklyn/event/basic/BasicSensor.java @@ -25,8 +25,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; - -import brooklyn.util.guava.TypeTokens; +import org.apache.brooklyn.util.guava.TypeTokens; import com.google.common.base.Objects; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java index 4f990cf..c964bf4 100644 --- a/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java +++ b/core/src/main/java/brooklyn/event/basic/DependentConfiguration.java @@ -44,6 +44,7 @@ import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.DeferredSupplier; @@ -52,28 +53,27 @@ import org.apache.brooklyn.core.util.task.ParallelTask; import org.apache.brooklyn.core.util.task.TaskInternal; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ValueResolver; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.NotManagedException; +import org.apache.brooklyn.util.exceptions.RuntimeTimeoutException; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Lifecycle; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.CompoundRuntimeException; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.NotManagedException; -import brooklyn.util.exceptions.RuntimeTimeoutException; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Function; @@ -736,7 +736,7 @@ public class DependentConfiguration { return (MultiBuilder<T,V, V2b>) this; } /** Apply post-processing to the entire list of results - * See {@link CollectionFunctionals#all(Predicate)} and {@link CollectionFunctionals#quorum(brooklyn.util.collections.QuorumCheck, Predicate) + * See {@link CollectionFunctionals#all(Predicate)} and {@link CollectionFunctionals#quorum(org.apache.brooklyn.util.collections.QuorumCheck, Predicate) * which allow useful arguments. */ public MultiBuilder<T, V, Boolean> postProcessFromMultiple(final Predicate<? super List<V>> val) { return postProcessFromMultiple(Functions.forPredicate(val)); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/ListConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/ListConfigKey.java b/core/src/main/java/brooklyn/event/basic/ListConfigKey.java index dadbd9e..f969f13 100644 --- a/core/src/main/java/brooklyn/event/basic/ListConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/ListConfigKey.java @@ -25,11 +25,10 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.core.internal.storage.impl.ConcurrentMapAcceptingNullVals; +import org.apache.brooklyn.util.collections.MutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; - /** A config key representing a list of values. * If a value is set on this key, it is _added_ to the list. * (With a warning is issued if a collection is passed in.) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/MapConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/MapConfigKey.java b/core/src/main/java/brooklyn/event/basic/MapConfigKey.java index bb3df39..c7b6801 100644 --- a/core/src/main/java/brooklyn/event/basic/MapConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/MapConfigKey.java @@ -26,13 +26,12 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.Jsonya; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.Jsonya; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Supplier; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java index ffd8229..25372a9 100644 --- a/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/PortAttributeSensorAndConfigKey.java @@ -28,17 +28,16 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.location.PortSupplier; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import org.apache.brooklyn.location.basic.Locations; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Optional; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/Sensors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/Sensors.java b/core/src/main/java/brooklyn/event/basic/Sensors.java index 5782be2..d3d995f 100644 --- a/core/src/main/java/brooklyn/event/basic/Sensors.java +++ b/core/src/main/java/brooklyn/event/basic/Sensors.java @@ -28,12 +28,12 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; +import org.apache.brooklyn.util.net.UserAndHostAndPort; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import brooklyn.config.render.RendererHints; -import brooklyn.util.net.UserAndHostAndPort; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; 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/event/basic/SetConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/SetConfigKey.java b/core/src/main/java/brooklyn/event/basic/SetConfigKey.java index fcd4afe..5c7357c 100644 --- a/core/src/main/java/brooklyn/event/basic/SetConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/SetConfigKey.java @@ -24,11 +24,10 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.util.collections.MutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableSet; - /** A config key representing a set of values. * If a value is set using this *typed* key, it is _added_ to the set * (with a warning issued if a collection is passed in). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java b/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java index 3fd023c..ad6cad6 100644 --- a/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/SubElementConfigKey.java @@ -21,9 +21,8 @@ package brooklyn.event.basic; import java.util.Map; import org.apache.brooklyn.api.management.ExecutionContext; - -import brooklyn.config.ConfigKey; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.exceptions.Exceptions; @SuppressWarnings("rawtypes") public class SubElementConfigKey<T> extends BasicConfigKey<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java index 8537f49..1558bab 100644 --- a/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java +++ b/core/src/main/java/brooklyn/event/basic/TemplatedStringAttributeSensorAndConfigKey.java @@ -20,12 +20,12 @@ package brooklyn.event.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityInternal; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/AbstractFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java index 59ed4f7..1bbdb5c 100644 --- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java +++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java @@ -26,17 +26,17 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.policy.basic.AbstractEntityAdjunct; +import org.apache.brooklyn.util.javalang.JavaClassNames; +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.entity.basic.EntityInternal; import brooklyn.entity.rebind.BasicFeedRebindSupport; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.text.Strings; /** * Captures common fields and processes for sensor feeds. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java b/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java index ff4ef6e..533b709 100644 --- a/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java +++ b/core/src/main/java/brooklyn/event/feed/AttributePollHandler.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.Lifecycle.Transition; -import brooklyn.util.time.Duration; /** * Handler for when polling an entity's attribute. On each poll result the entity's attribute is set. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/FeedConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/FeedConfig.java b/core/src/main/java/brooklyn/event/feed/FeedConfig.java index a0b473f..1ac8f70 100644 --- a/core/src/main/java/brooklyn/event/feed/FeedConfig.java +++ b/core/src/main/java/brooklyn/event/feed/FeedConfig.java @@ -21,14 +21,14 @@ package brooklyn.event.feed; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.text.Strings; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.http.HttpPollConfig; -import brooklyn.util.collections.MutableList; -import brooklyn.util.guava.Functionals; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/PollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/PollConfig.java b/core/src/main/java/brooklyn/event/feed/PollConfig.java index 2032a8d..3a8ed6b 100644 --- a/core/src/main/java/brooklyn/event/feed/PollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/PollConfig.java @@ -23,9 +23,8 @@ import static com.google.common.base.Preconditions.checkArgument; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.event.AttributeSensor; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.time.Duration; /** * Configuration for polling, which is being added to a feed (e.g. to poll a given URL over http). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/Poller.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/Poller.java b/core/src/main/java/brooklyn/event/feed/Poller.java index 2f14f22..955302f 100644 --- a/core/src/main/java/brooklyn/event/feed/Poller.java +++ b/core/src/main/java/brooklyn/event/feed/Poller.java @@ -27,6 +27,8 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.DynamicSequentialTask; import org.apache.brooklyn.core.util.task.ScheduledTask; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +36,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java index 4da5ef8..2466fdf 100644 --- a/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java +++ b/core/src/main/java/brooklyn/event/feed/function/FunctionFeed.java @@ -26,15 +26,15 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; -import brooklyn.util.time.Duration; import com.google.common.base.Objects; import com.google.common.collect.HashMultimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/function/FunctionPollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/function/FunctionPollConfig.java b/core/src/main/java/brooklyn/event/feed/function/FunctionPollConfig.java index 55ca1c3..e297b02 100644 --- a/core/src/main/java/brooklyn/event/feed/function/FunctionPollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/function/FunctionPollConfig.java @@ -24,12 +24,12 @@ import groovy.lang.Closure; import java.util.concurrent.Callable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.javalang.JavaClassNames; import brooklyn.event.feed.FeedConfig; import brooklyn.event.feed.PollConfig; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.guava.Functionals; -import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java b/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java index 39f008a..dbe701a 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpFeed.java @@ -29,23 +29,23 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.core.util.http.HttpTool.HttpClientBuilder; +import org.apache.brooklyn.util.time.Duration; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; -import brooklyn.util.time.Duration; import com.google.common.base.Objects; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java b/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java index b27fede..e0ed10b 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpPollConfig.java @@ -26,11 +26,11 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import brooklyn.event.feed.PollConfig; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java b/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java index f6ab2b5..e09e182 100644 --- a/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java +++ b/core/src/main/java/brooklyn/event/feed/http/HttpValueFunctions.java @@ -21,8 +21,7 @@ package brooklyn.event.feed.http; import java.util.List; import org.apache.brooklyn.core.util.http.HttpToolResponse; - -import brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Functionals; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/http/JsonFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/http/JsonFunctions.java b/core/src/main/java/brooklyn/event/feed/http/JsonFunctions.java index b4a781d..9e0eb41 100644 --- a/core/src/main/java/brooklyn/event/feed/http/JsonFunctions.java +++ b/core/src/main/java/brooklyn/event/feed/http/JsonFunctions.java @@ -27,9 +27,9 @@ import java.util.NoSuchElementException; import javax.annotation.Nullable; -import brooklyn.util.guava.Functionals; -import brooklyn.util.guava.Maybe; -import brooklyn.util.guava.MaybeFunctions; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.MaybeFunctions; import com.google.common.base.Function; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java index 5c82be7..63c78ef 100644 --- a/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java +++ b/core/src/main/java/brooklyn/event/feed/shell/ShellFeed.java @@ -29,13 +29,13 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.core.util.task.system.internal.SystemProcessTaskFactory.ConcreteSystemProcessTaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.feed.AbstractFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/shell/ShellPollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/shell/ShellPollConfig.java b/core/src/main/java/brooklyn/event/feed/shell/ShellPollConfig.java index eaefbc5..d7251ff 100644 --- a/core/src/main/java/brooklyn/event/feed/shell/ShellPollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/shell/ShellPollConfig.java @@ -27,10 +27,10 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableList; import brooklyn.event.feed.PollConfig; import brooklyn.event.feed.ssh.SshPollValue; -import brooklyn.util.collections.MutableList; import com.google.common.base.Predicate; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java b/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java index 46c751b..ad37a56 100644 --- a/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java +++ b/core/src/main/java/brooklyn/event/feed/ssh/SshFeed.java @@ -30,12 +30,12 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.feed.AbstractFeed; import brooklyn.event.feed.AttributePollHandler; @@ -45,8 +45,7 @@ import brooklyn.event.feed.Poller; import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Objects; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/brooklyn/event/feed/ssh/SshPollConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/ssh/SshPollConfig.java b/core/src/main/java/brooklyn/event/feed/ssh/SshPollConfig.java index 82fca44..b7fe0cb 100644 --- a/core/src/main/java/brooklyn/event/feed/ssh/SshPollConfig.java +++ b/core/src/main/java/brooklyn/event/feed/ssh/SshPollConfig.java @@ -25,10 +25,10 @@ import java.util.Map; import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; import brooklyn.event.feed.PollConfig; -import brooklyn.util.collections.MutableList; -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/event/feed/windows/WindowsPerformanceCounterFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java index c06c013..734dc7f 100644 --- a/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeed.java @@ -38,11 +38,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.ExecutionContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks; @@ -52,9 +52,8 @@ import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import org.apache.brooklyn.location.basic.WinRmMachineLocation; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/basic/AbstractBrooklynObject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/AbstractBrooklynObject.java b/core/src/main/java/org/apache/brooklyn/basic/AbstractBrooklynObject.java index 4515492..77cce40 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/AbstractBrooklynObject.java +++ b/core/src/main/java/org/apache/brooklyn/basic/AbstractBrooklynObject.java @@ -27,13 +27,13 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.proxying.InternalFactory; import brooklyn.entity.rebind.RebindManagerImpl; -import brooklyn.util.text.Identifiers; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/basic/BasicConfigurableObject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/BasicConfigurableObject.java b/core/src/main/java/org/apache/brooklyn/basic/BasicConfigurableObject.java index f79b1d7..3994ad2 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/BasicConfigurableObject.java +++ b/core/src/main/java/org/apache/brooklyn/basic/BasicConfigurableObject.java @@ -22,15 +22,15 @@ import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigMap; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.text.Identifiers; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.config.ConfigMap; -import brooklyn.util.text.Identifiers; /** * A parent class for ancilliary objects that do not require the full heavy lifting of {@link AbstractBrooklynObject} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/basic/BrooklynDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/BrooklynDynamicType.java b/core/src/main/java/org/apache/brooklyn/basic/BrooklynDynamicType.java index f6a8893..b0c775a 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/BrooklynDynamicType.java +++ b/core/src/main/java/org/apache/brooklyn/basic/BrooklynDynamicType.java @@ -34,15 +34,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.basic.BrooklynType; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.event.basic.BasicConfigKey.BasicConfigKeyOverwriting; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.text.Strings; import com.google.common.base.Joiner; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/basic/BrooklynObjectInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/BrooklynObjectInternal.java b/core/src/main/java/org/apache/brooklyn/basic/BrooklynObjectInternal.java index eacb1e1..54fe081 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/BrooklynObjectInternal.java +++ b/core/src/main/java/org/apache/brooklyn/basic/BrooklynObjectInternal.java @@ -24,11 +24,10 @@ import org.apache.brooklyn.api.basic.BrooklynObject; 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.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -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/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypeSnapshot.java index f7b0577..d93f0da 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypeSnapshot.java +++ b/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypeSnapshot.java @@ -22,9 +22,8 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.basic.BrooklynType; - -import brooklyn.config.ConfigKey; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypes.java b/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypes.java index d199686..2a28c80 100644 --- a/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypes.java +++ b/core/src/main/java/org/apache/brooklyn/basic/BrooklynTypes.java @@ -26,12 +26,12 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.PolicyDynamicType; +import org.apache.brooklyn.util.exceptions.Exceptions; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.EnricherDynamicType; import brooklyn.entity.basic.EntityDynamicType; -import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java index fce204a..fc0ab56 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java @@ -60,21 +60,20 @@ import org.apache.brooklyn.core.util.flags.TypeCoercions; import brooklyn.config.BrooklynServerConfig; import org.apache.brooklyn.location.basic.BasicLocationRegistry; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.AggregateClassLoader; -import brooklyn.util.javalang.LoadedClassLoader; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; -import brooklyn.util.yaml.Yamls; -import brooklyn.util.yaml.Yamls.YamlExtract; +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.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.AggregateClassLoader; +import org.apache.brooklyn.util.javalang.LoadedClassLoader; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; +import org.apache.brooklyn.util.yaml.Yamls; +import org.apache.brooklyn.util.yaml.Yamls.YamlExtract; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java index 822a8d2..7a7536f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java @@ -42,14 +42,14 @@ import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.javalang.ReflectionScanner; import org.apache.brooklyn.core.util.javalang.UrlClassLoader; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.AggregateClassLoader; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Time; import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.AggregateClassLoader; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDo.java index 8e53e28..c9acc8c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDo.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDo.java @@ -27,16 +27,15 @@ import java.util.Map; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.catalog.internal.CatalogClasspathDo.CatalogScanningModes; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.AggregateClassLoader; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.AggregateClassLoader; -import brooklyn.util.net.Urls; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; - import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java index aefb635..7fab5bd 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java @@ -28,12 +28,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.core.util.ResourceUtils; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.PropagatedRuntimeException; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.PropagatedRuntimeException; +import org.apache.brooklyn.util.stream.Streams; import com.google.common.annotations.Beta; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoUtils.java index 6a27393..4ca28c3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoUtils.java @@ -23,11 +23,10 @@ import java.io.InputStreamReader; import org.apache.brooklyn.core.catalog.internal.CatalogClasspathDo.CatalogScanningModes; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; - public class CatalogDtoUtils { private static final Logger log = LoggerFactory.getLogger(CatalogDtoUtils.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java index e00211c..ee36265 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java @@ -31,16 +31,16 @@ import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.FatalRuntimeException; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; import brooklyn.config.BrooklynServerConfig; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.FatalRuntimeException; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.os.Os; -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/org/apache/brooklyn/core/catalog/internal/CatalogItemComparator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemComparator.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemComparator.java index 6832503..dc41457 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemComparator.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemComparator.java @@ -24,8 +24,7 @@ import java.util.Collection; import java.util.Comparator; import org.apache.brooklyn.api.catalog.CatalogItem; - -import brooklyn.util.text.NaturalOrderComparator; +import org.apache.brooklyn.util.text.NaturalOrderComparator; /** * Largest version first order. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java index 1949238..309d055 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java @@ -24,14 +24,12 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.brooklyn.basic.BrooklynObjectInternal; - +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.mementos.CatalogItemMemento; -import brooklyn.config.ConfigKey; - import com.google.common.base.Preconditions; public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObjectInternal { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java index a8b65bf..766075f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java @@ -28,18 +28,16 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.AbstractBrooklynObject; - import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableList; -import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.BasicCatalogItemRebindSupport; -import brooklyn.util.collections.MutableList; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java index f8db025..426562e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java @@ -24,9 +24,7 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynObjectInternal; - import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; @@ -40,13 +38,13 @@ import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoading import org.apache.brooklyn.core.management.classloading.OsgiBrooklynClassLoadingContext; import org.apache.brooklyn.core.management.ha.OsgiManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Time; import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.RebindManagerImpl.RebindTracker; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java index d1104af..71203e8 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java @@ -23,8 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.Networking; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/classloading/AbstractBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/classloading/AbstractBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/management/classloading/AbstractBrooklynClassLoadingContext.java index a8366df..8dfc0b5 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/classloading/AbstractBrooklynClassLoadingContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/classloading/AbstractBrooklynClassLoadingContext.java @@ -4,8 +4,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/classloading/BrooklynClassLoadingContextSequential.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/classloading/BrooklynClassLoadingContextSequential.java b/core/src/main/java/org/apache/brooklyn/core/management/classloading/BrooklynClassLoadingContextSequential.java index afc2232..2e94099 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/classloading/BrooklynClassLoadingContextSequential.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/classloading/BrooklynClassLoadingContextSequential.java @@ -24,14 +24,13 @@ import java.util.Set; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; - import com.google.common.base.Objects; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/classloading/JavaBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/management/classloading/JavaBrooklynClassLoadingContext.java index 99fa15b..0768e82 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/classloading/JavaBrooklynClassLoadingContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/classloading/JavaBrooklynClassLoadingContext.java @@ -27,9 +27,8 @@ import java.util.Collections; import java.util.Enumeration; import org.apache.brooklyn.api.management.ManagementContext; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/classloading/OsgiBrooklynClassLoadingContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/classloading/OsgiBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/management/classloading/OsgiBrooklynClassLoadingContext.java index 84baa20..3ab4e06 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/classloading/OsgiBrooklynClassLoadingContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/classloading/OsgiBrooklynClassLoadingContext.java @@ -30,8 +30,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.ha.OsgiManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; - -import brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe; import com.google.common.base.Objects;
