http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/entitlement/Entitlements.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/Entitlements.java b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/Entitlements.java index dc49053..24a9f5e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/Entitlements.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/Entitlements.java @@ -29,8 +29,12 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.entitlement.EntitlementClass; import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import org.apache.brooklyn.api.management.entitlement.EntitlementManager; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,13 +48,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; import brooklyn.config.BrooklynProperties; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.text.Strings; /** @since 0.7.0 */ @Beta
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/entitlement/PerUserEntitlementManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/PerUserEntitlementManager.java b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/PerUserEntitlementManager.java index c5914e8..923479b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/PerUserEntitlementManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/PerUserEntitlementManager.java @@ -23,15 +23,15 @@ import java.util.Map; import org.apache.brooklyn.api.management.entitlement.EntitlementClass; import org.apache.brooklyn.api.management.entitlement.EntitlementContext; import org.apache.brooklyn.api.management.entitlement.EntitlementManager; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; -import brooklyn.config.ConfigKey; import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; 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/management/entitlement/WebEntitlementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/WebEntitlementContext.java b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/WebEntitlementContext.java index 2efed42..d9e5580 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/entitlement/WebEntitlementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/entitlement/WebEntitlementContext.java @@ -19,8 +19,7 @@ package org.apache.brooklyn.core.management.entitlement; import org.apache.brooklyn.api.management.entitlement.EntitlementContext; - -import brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.javalang.JavaClassNames; /** * Indicates an authenticated web request as the entitlements context; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/ha/BasicMasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/ha/BasicMasterChooser.java b/core/src/main/java/org/apache/brooklyn/core/management/ha/BasicMasterChooser.java index 034a6bd..db35697 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/ha/BasicMasterChooser.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/ha/BasicMasterChooser.java @@ -26,13 +26,12 @@ import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.text.NaturalOrderComparator; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; -import brooklyn.util.text.NaturalOrderComparator; -import brooklyn.util.time.Duration; - import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ComparisonChain; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/management/ha/HighAvailabilityManagerImpl.java index f369124..1a3a21c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/ha/HighAvailabilityManagerImpl.java @@ -42,6 +42,7 @@ import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.api.management.ha.MementoCopyMode; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister.Delta; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog; import org.apache.brooklyn.core.catalog.internal.CatalogDto; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; @@ -53,12 +54,18 @@ import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.management.internal.ManagementTransitionMode; import org.apache.brooklyn.core.util.task.ScheduledTask; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.BrooklynVersion; import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; @@ -69,13 +76,6 @@ import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.entity.rebind.plane.dto.BasicManagementNodeSyncRecord; import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl; import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl.Builder; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.text.Strings; -import 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/org/apache/brooklyn/core/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java b/core/src/main/java/org/apache/brooklyn/core/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java index 7f188be..c22c7f9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/ha/ManagementPlaneSyncRecordPersisterToObjectStore.java @@ -33,6 +33,10 @@ import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; +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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,10 +48,6 @@ import brooklyn.entity.rebind.persister.StoreObjectAccessorLocking; import brooklyn.entity.rebind.persister.XmlMementoSerializer; import brooklyn.entity.rebind.plane.dto.BasicManagementNodeSyncRecord; import brooklyn.entity.rebind.plane.dto.ManagementPlaneSyncRecordImpl; -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/org/apache/brooklyn/core/management/ha/MasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/ha/MasterChooser.java b/core/src/main/java/org/apache/brooklyn/core/management/ha/MasterChooser.java index 2a2bd09..8d325d8 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/ha/MasterChooser.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/ha/MasterChooser.java @@ -20,8 +20,7 @@ package org.apache.brooklyn.core.management.ha; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; - -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/org/apache/brooklyn/core/management/ha/OsgiManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/ha/OsgiManager.java b/core/src/main/java/org/apache/brooklyn/core/management/ha/OsgiManager.java index 8241479..4d52960 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/ha/OsgiManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/ha/OsgiManager.java @@ -39,21 +39,21 @@ import brooklyn.BrooklynVersion; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.osgi.Osgis; import org.apache.brooklyn.core.util.osgi.Osgis.BundleFinder; +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.os.Os; +import org.apache.brooklyn.util.os.Os.DeletionResult; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.os.Os; -import brooklyn.util.os.Os.DeletionResult; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import com.google.common.base.Throwables; 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/core/management/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/AbstractManagementContext.java index 0936bb2..82e9e49 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/AbstractManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/AbstractManagementContext.java @@ -50,6 +50,7 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.api.management.entitlement.EntitlementManager; import org.apache.brooklyn.api.management.ha.HighAvailabilityManager; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; @@ -67,7 +68,6 @@ import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.Tasks; import brooklyn.config.BrooklynProperties; -import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; @@ -76,11 +76,11 @@ import brooklyn.entity.drivers.downloads.BasicDownloadsManager; import brooklyn.entity.rebind.RebindManagerImpl; import org.apache.brooklyn.location.basic.BasicLocationRegistry; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; 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/org/apache/brooklyn/core/management/internal/AsyncCollectionChangeAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/AsyncCollectionChangeAdapter.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/AsyncCollectionChangeAdapter.java index 1fc1060..09b2571 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/AsyncCollectionChangeAdapter.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/AsyncCollectionChangeAdapter.java @@ -23,12 +23,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.SingleThreadedScheduler; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; - public class AsyncCollectionChangeAdapter<Item> implements CollectionChangeListener<Item> { private static final Logger LOG = LoggerFactory.getLogger(AsyncCollectionChangeAdapter.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/BasicSubscriptionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/BasicSubscriptionContext.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/BasicSubscriptionContext.java index 04aa18f..836c0a6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/BasicSubscriptionContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/BasicSubscriptionContext.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.core.management.internal; -import static brooklyn.util.JavaGroovyEquivalents.mapOf; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.mapOf; import groovy.lang.Closure; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/BrooklynGarbageCollector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/BrooklynGarbageCollector.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/BrooklynGarbageCollector.java index ad13d42..a336845 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/BrooklynGarbageCollector.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/BrooklynGarbageCollector.java @@ -39,27 +39,27 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.ExecutionListener; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.MemoryUsageTracker; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedEntity; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.MemoryUsageTracker; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import com.google.common.base.Objects; 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/internal/EffectorUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/EffectorUtils.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/EffectorUtils.java index 0f3ab99..218bc75 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/EffectorUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/EffectorUtils.java @@ -35,17 +35,17 @@ import org.apache.brooklyn.api.entity.ParameterType; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.config.ConfigBag; 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.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.PropagatedRuntimeException; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BasicParameterType; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.PropagatedRuntimeException; -import brooklyn.util.guava.Maybe; import com.google.common.collect.Lists; 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/management/internal/EntityChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityChangeListener.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityChangeListener.java index d6552ff..c503c80 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityChangeListener.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityChangeListener.java @@ -23,8 +23,7 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.Policy; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; public interface EntityChangeListener { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementSupport.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementSupport.java index dbba29c..608352f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementSupport.java @@ -34,18 +34,18 @@ import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.entitlement.EntitlementManager; 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.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.Entitlements.EntityAndItem; import org.apache.brooklyn.core.management.entitlement.Entitlements.StringAndArgument; import org.apache.brooklyn.core.management.internal.NonDeploymentManagementContext.NonDeploymentManagementContextMode; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.exceptions.Exceptions; 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/org/apache/brooklyn/core/management/internal/EntityManagementUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementUtils.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementUtils.java index f21d93a..d75fa19 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/EntityManagementUtils.java @@ -36,27 +36,27 @@ import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.camp.spi.Assembly; import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoadingContext; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.effector.Effectors; import brooklyn.entity.trait.Startable; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; 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/org/apache/brooklyn/core/management/internal/LocalEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalEntityManager.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalEntityManager.java index 84afdba..772d513 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalEntityManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalEntityManager.java @@ -45,6 +45,11 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.SetFromLiveMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,11 +65,6 @@ import brooklyn.entity.proxying.EntityProxyImpl; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalPolicyFactory; import brooklyn.entity.trait.Startable; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.SetFromLiveMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalLocationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalLocationManager.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalLocationManager.java index b22c5aa..5f13331 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalLocationManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalLocationManager.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.ProvisioningLocation; import org.apache.brooklyn.api.management.AccessController; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.util.config.ConfigBag; @@ -38,17 +39,15 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynLogging; import brooklyn.config.BrooklynLogging.LoggingLevel; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.InternalLocationFactory; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.stream.Streams; 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/management/internal/LocalManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalManagementContext.java index ab14c42..02f33a7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalManagementContext.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.core.management.internal; -import static brooklyn.util.JavaGroovyEquivalents.elvis; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; import java.util.Arrays; import java.util.Collection; @@ -51,6 +51,9 @@ import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskTags; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,9 +64,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalLocationFactory; import brooklyn.entity.proxying.InternalPolicyFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -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/org/apache/brooklyn/core/management/internal/LocalSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalSubscriptionManager.java index 9a75621..b52cab9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalSubscriptionManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalSubscriptionManager.java @@ -18,10 +18,10 @@ */ package org.apache.brooklyn.core.management.internal; -import static brooklyn.util.JavaGroovyEquivalents.elvis; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; -import static brooklyn.util.JavaGroovyEquivalents.join; -import static brooklyn.util.JavaGroovyEquivalents.mapOf; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.join; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.mapOf; import java.util.Collection; import java.util.Collections; @@ -42,11 +42,11 @@ import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.SubscriptionManager; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.SingleThreadedScheduler; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; -import brooklyn.util.text.Identifiers; import com.google.common.base.Predicate; import com.google.common.collect.ArrayListMultimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalUsageManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalUsageManager.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalUsageManager.java index 3aeb57a..c426c93 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalUsageManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/LocalUsageManager.java @@ -51,10 +51,9 @@ import brooklyn.entity.basic.Lifecycle; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.basic.LocationInternal; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.Reflections; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.Reflections; +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/core/management/internal/ManagementContextInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/ManagementContextInternal.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/ManagementContextInternal.java index fd19964..4aad93a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/ManagementContextInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/ManagementContextInternal.java @@ -33,13 +33,13 @@ import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.management.ha.OsgiManager; import org.apache.brooklyn.core.util.task.TaskTags; +import org.apache.brooklyn.util.guava.Maybe; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalLocationFactory; import brooklyn.entity.proxying.InternalPolicyFactory; -import brooklyn.util.guava.Maybe; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/NonDeploymentManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/NonDeploymentManagementContext.java index 4d8196d..2a66a35 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/NonDeploymentManagementContext.java @@ -59,19 +59,19 @@ import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.ha.OsgiManager; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.time.Duration; import brooklyn.config.BrooklynProperties; -import brooklyn.config.StringConfigMap; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.proxying.InternalEntityFactory; import brooklyn.entity.proxying.InternalLocationFactory; import brooklyn.entity.proxying.InternalPolicyFactory; -import brooklyn.util.guava.Maybe; -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/org/apache/brooklyn/core/management/internal/Subscription.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/Subscription.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/Subscription.java index acd30c3..44e8387 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/Subscription.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/Subscription.java @@ -25,8 +25,7 @@ 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.api.management.SubscriptionHandle; - -import brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Identifiers; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/management/internal/UsageManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/management/internal/UsageManager.java b/core/src/main/java/org/apache/brooklyn/core/management/internal/UsageManager.java index 75c242a..d33ff2d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/management/internal/UsageManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/management/internal/UsageManager.java @@ -26,15 +26,15 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.usage.ApplicationUsage; import org.apache.brooklyn.core.management.usage.LocationUsage; import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Lifecycle; -import brooklyn.util.time.Duration; 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/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/policy/basic/AbstractEntityAdjunct.java index f5c36aa..78b3820 100644 --- a/core/src/main/java/org/apache/brooklyn/core/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/org/apache/brooklyn/core/policy/basic/AbstractEntityAdjunct.java @@ -40,25 +40,25 @@ import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.EntityAdjunct; +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.internal.SubscriptionTracker; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.AbstractBrooklynObject; import org.apache.brooklyn.basic.BrooklynObjectInternal; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.config.ConfigMap; + import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Strings; 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/policy/basic/AdjunctType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/basic/AdjunctType.java b/core/src/main/java/org/apache/brooklyn/core/policy/basic/AdjunctType.java index f3d6a6c..4f15299 100644 --- a/core/src/main/java/org/apache/brooklyn/core/policy/basic/AdjunctType.java +++ b/core/src/main/java/org/apache/brooklyn/core/policy/basic/AdjunctType.java @@ -26,12 +26,11 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.policy.EntityAdjunct; +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.base.Joiner; 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/org/apache/brooklyn/core/policy/basic/ConfigMapImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/basic/ConfigMapImpl.java b/core/src/main/java/org/apache/brooklyn/core/policy/basic/ConfigMapImpl.java index 5cdc279..cc89ad3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/policy/basic/ConfigMapImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/policy/basic/ConfigMapImpl.java @@ -25,8 +25,10 @@ import java.util.Map; 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.flags.TypeCoercions; import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting; +import org.apache.brooklyn.util.guava.Maybe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,13 +36,11 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Maps; -import brooklyn.config.ConfigKey; import brooklyn.config.internal.AbstractConfigMapImpl; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.Sanitizer; import brooklyn.event.basic.StructuredConfigKey; -import brooklyn.util.guava.Maybe; public class ConfigMapImpl extends AbstractConfigMapImpl { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/policy/basic/PolicyTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/basic/PolicyTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/core/policy/basic/PolicyTypeSnapshot.java index 6604350..a9a81de 100644 --- a/core/src/main/java/org/apache/brooklyn/core/policy/basic/PolicyTypeSnapshot.java +++ b/core/src/main/java/org/apache/brooklyn/core/policy/basic/PolicyTypeSnapshot.java @@ -21,9 +21,8 @@ package org.apache.brooklyn.core.policy.basic; import java.util.Map; import org.apache.brooklyn.api.policy.PolicyType; - import org.apache.brooklyn.basic.BrooklynTypeSnapshot; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; public class PolicyTypeSnapshot extends BrooklynTypeSnapshot implements PolicyType { private static final long serialVersionUID = 4670930188951106009L; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/BrooklynMavenArtifacts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/BrooklynMavenArtifacts.java b/core/src/main/java/org/apache/brooklyn/core/util/BrooklynMavenArtifacts.java index c00fec0..0ae951e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/BrooklynMavenArtifacts.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/BrooklynMavenArtifacts.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.core.util; +import org.apache.brooklyn.util.maven.MavenArtifact; +import org.apache.brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.text.Strings; + import brooklyn.BrooklynVersion; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.text.Strings; public class BrooklynMavenArtifacts { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/BrooklynNetworkUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/BrooklynNetworkUtils.java b/core/src/main/java/org/apache/brooklyn/core/util/BrooklynNetworkUtils.java index 7240425..654aeb2 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/BrooklynNetworkUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/BrooklynNetworkUtils.java @@ -24,9 +24,8 @@ import brooklyn.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.location.geo.LocalhostExternalIpLoader; - -import brooklyn.util.JavaGroovyEquivalents; -import brooklyn.util.net.Networking; +import org.apache.brooklyn.util.JavaGroovyEquivalents; +import org.apache.brooklyn.util.net.Networking; public class BrooklynNetworkUtils { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/ResourceUtils.java b/core/src/main/java/org/apache/brooklyn/core/util/ResourceUtils.java index bbd88d5..f3acac3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/ResourceUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/ResourceUtils.java @@ -57,14 +57,13 @@ import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.Threads; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.Threads; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/config/ConfigBag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/config/ConfigBag.java b/core/src/main/java/org/apache/brooklyn/core/util/config/ConfigBag.java index 0152bb9..d69630f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/config/ConfigBag.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/config/ConfigBag.java @@ -26,17 +26,17 @@ import java.util.Map; import javax.annotation.Nonnull; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; 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.javalang.JavaClassNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.JavaClassNames; 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/util/crypto/FluentKeySigner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/crypto/FluentKeySigner.java b/core/src/main/java/org/apache/brooklyn/core/util/crypto/FluentKeySigner.java index 1d0b030..ebced52 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/crypto/FluentKeySigner.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/crypto/FluentKeySigner.java @@ -29,12 +29,11 @@ import java.util.Date; import javax.security.auth.x500.X500Principal; import org.apache.brooklyn.core.internal.BrooklynInitialization; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; import org.bouncycastle.asn1.x509.X509Extension; import org.bouncycastle.jce.X509Principal; -import brooklyn.util.exceptions.Exceptions; - /** A fluent API which simplifies generating certificates (signed keys) */ /* NB - re deprecation - we use deprecated X509V3CertificateGenerator still * because the official replacement, X509v3CertificateBuilder, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/crypto/SecureKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/crypto/SecureKeys.java b/core/src/main/java/org/apache/brooklyn/core/util/crypto/SecureKeys.java index 5e630a8..4d6511c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/crypto/SecureKeys.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/crypto/SecureKeys.java @@ -29,6 +29,10 @@ import java.security.PublicKey; import java.security.Security; import org.apache.brooklyn.core.internal.BrooklynInitialization; +import org.apache.brooklyn.util.crypto.AuthorizedKeysParser; +import org.apache.brooklyn.util.crypto.SecureKeysWithoutBouncyCastle; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.jce.X509Principal; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -43,11 +47,6 @@ import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.crypto.AuthorizedKeysParser; -import brooklyn.util.crypto.SecureKeysWithoutBouncyCastle; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; - 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/org/apache/brooklyn/core/util/file/ArchiveBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveBuilder.java b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveBuilder.java index 069f10b..c8946f8 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveBuilder.java @@ -34,9 +34,8 @@ import java.util.jar.Manifest; import java.util.zip.ZipOutputStream; import org.apache.brooklyn.core.util.file.ArchiveUtils.ArchiveType; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; import com.google.common.annotations.Beta; 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/core/util/file/ArchiveTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveTasks.java b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveTasks.java index b58359a..a618acb 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveTasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveTasks.java @@ -25,8 +25,7 @@ import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.net.Urls; +import org.apache.brooklyn.util.net.Urls; public class ArchiveTasks { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveUtils.java b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveUtils.java index 8277a0d..37ccf34 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/file/ArchiveUtils.java @@ -35,15 +35,14 @@ import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.StackTraceSimplifier; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.StackTraceSimplifier; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Charsets; 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/util/flags/FlagUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/flags/FlagUtils.java b/core/src/main/java/org/apache/brooklyn/core/util/flags/FlagUtils.java index 6f28f9b..931d1a0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/flags/FlagUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/flags/FlagUtils.java @@ -35,15 +35,15 @@ import java.util.NoSuchElementException; import java.util.Set; 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 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.config.ConfigKey.HasConfigKey; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; import com.google.common.base.Objects; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/flags/MethodCoercions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/flags/MethodCoercions.java b/core/src/main/java/org/apache/brooklyn/core/util/flags/MethodCoercions.java index 20116cf..4a26804 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/flags/MethodCoercions.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/flags/MethodCoercions.java @@ -18,14 +18,16 @@ */ package org.apache.brooklyn.core.util.flags; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; import javax.annotation.Nullable; + +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -72,7 +74,7 @@ public class MethodCoercions { * @param instance the object to invoke the method on * @param methodName the name of the method to invoke * @param argument the argument to the method's parameter. - * @return the result of the method call, or {@link brooklyn.util.guava.Maybe#absent()} if method could not be matched. + * @return the result of the method call, or {@link org.apache.brooklyn.util.guava.Maybe#absent()} if method could not be matched. */ public static Maybe<?> tryFindAndInvokeSingleParameterMethod(final Object instance, final String methodName, final Object argument) { Class<?> clazz = instance.getClass(); @@ -130,7 +132,7 @@ public class MethodCoercions { * @param instance the object to invoke the method on * @param methodName the name of the method to invoke * @param argument a list of the arguments to the method's parameters. - * @return the result of the method call, or {@link brooklyn.util.guava.Maybe#absent()} if method could not be matched. + * @return the result of the method call, or {@link org.apache.brooklyn.util.guava.Maybe#absent()} if method could not be matched. */ public static Maybe<?> tryFindAndInvokeMultiParameterMethod(final Object instance, final String methodName, final List<?> arguments) { Class<?> clazz = instance.getClass(); @@ -161,7 +163,7 @@ public class MethodCoercions { * @param instance the object to invoke the method on * @param methodName the name of the method to invoke * @param argument a list of the arguments to the method's parameters, or a single argument for a single-parameter method. - * @return the result of the method call, or {@link brooklyn.util.guava.Maybe#absent()} if method could not be matched. + * @return the result of the method call, or {@link org.apache.brooklyn.util.guava.Maybe#absent()} if method could not be matched. */ public static Maybe<?> tryFindAndInvokeBestMatchingMethod(final Object instance, final String methodName, final Object argument) { if (argument instanceof List) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/flags/TypeCoercions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/flags/TypeCoercions.java b/core/src/main/java/org/apache/brooklyn/core/util/flags/TypeCoercions.java index 2c03620..b9f7869 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/flags/TypeCoercions.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/flags/TypeCoercions.java @@ -47,6 +47,21 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.JavaGroovyEquivalents; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.Enums; +import org.apache.brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.UserAndHostAndPort; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; +import org.apache.brooklyn.util.yaml.Yamls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,21 +70,6 @@ import brooklyn.entity.basic.ClosureEntityFactory; import brooklyn.entity.basic.ConfigurableEntityFactory; import brooklyn.entity.basic.ConfigurableEntityFactoryFromEntityFactory; import brooklyn.event.basic.Sensors; -import brooklyn.util.JavaGroovyEquivalents; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.Enums; -import brooklyn.util.net.Cidr; -import brooklyn.util.net.Networking; -import brooklyn.util.net.UserAndHostAndPort; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; -import brooklyn.util.yaml.Yamls; import com.google.common.base.CaseFormat; import com.google.common.base.Function; @@ -640,7 +640,7 @@ public class TypeCoercions { registerAdapter(Object.class, Duration.class, new Function<Object,Duration>() { @Override public Duration apply(final Object input) { - return brooklyn.util.time.Duration.of(input); + return org.apache.brooklyn.util.time.Duration.of(input); } }); registerAdapter(Object.class, TimeDuration.class, new Function<Object,TimeDuration>() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/http/HttpTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/http/HttpTool.java b/core/src/main/java/org/apache/brooklyn/core/util/http/HttpTool.java index 43b1aee..e49a67e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/http/HttpTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/http/HttpTool.java @@ -29,6 +29,11 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; +import org.apache.brooklyn.util.crypto.SslTrustUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.net.URLParamEncoder; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.apache.commons.codec.binary.Base64; import org.apache.http.ConnectionReuseStrategy; import org.apache.http.HttpEntity; @@ -65,12 +70,6 @@ import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.crypto.SslTrustUtils; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.net.URLParamEncoder; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/http/HttpToolResponse.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/http/HttpToolResponse.java b/core/src/main/java/org/apache/brooklyn/core/util/http/HttpToolResponse.java index 97e7793..4a1f598 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/http/HttpToolResponse.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/http/HttpToolResponse.java @@ -26,6 +26,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -33,10 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.event.feed.http.HttpPollValue; -import brooklyn.util.guava.Maybe; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; 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/org/apache/brooklyn/core/util/internal/ConfigKeySelfExtracting.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ConfigKeySelfExtracting.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ConfigKeySelfExtracting.java index a1d85ca..311d240 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ConfigKeySelfExtracting.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ConfigKeySelfExtracting.java @@ -21,8 +21,7 @@ package org.apache.brooklyn.core.util.internal; import java.util.Map; import org.apache.brooklyn.api.management.ExecutionContext; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; /** Interface for resolving key values; typically implemented by the config key, * but discouraged for external usage. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/Repeater.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/Repeater.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/Repeater.java index 39e79da..178544a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/Repeater.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/Repeater.java @@ -27,15 +27,15 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.JavaGroovyEquivalents; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.JavaGroovyEquivalents; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import brooklyn.util.internal.TimeExtras; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Callables; @@ -77,7 +77,7 @@ import com.google.common.util.concurrent.Callables; * } * </pre> * - * @deprecated since 0.7.0, use {@link brooklyn.util.repeat.Repeater} instead + * @deprecated since 0.7.0, use {@link org.apache.brooklyn.util.repeat.Repeater} instead */ @Deprecated public class Repeater { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/BackoffLimitedRetryHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/BackoffLimitedRetryHandler.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/BackoffLimitedRetryHandler.java index b8d6eac..74d8aab 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/BackoffLimitedRetryHandler.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/BackoffLimitedRetryHandler.java @@ -18,11 +18,10 @@ */ package org.apache.brooklyn.core.util.internal.ssh; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; - /** * Allow replayable request to be retried a limited number of times, and impose an exponential back-off * delay before returning. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellAbstractTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellAbstractTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellAbstractTool.java index 90dcffa..7e7a6b3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellAbstractTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellAbstractTool.java @@ -32,20 +32,19 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.BashStringEscapes; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.MutableList; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringEscapes.BashStringEscapes; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Joiner; 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/util/internal/ssh/ShellTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellTool.java index 13bfb62..1d525df 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/ShellTool.java @@ -25,10 +25,11 @@ import java.io.OutputStream; import java.util.List; import java.util.Map; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; /** Methods for executing things in an environment (localhost process, or ssh) */ public interface ShellTool { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshAbstractTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshAbstractTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshAbstractTool.java index ea7a71e..1481cec 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshAbstractTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshAbstractTool.java @@ -18,15 +18,15 @@ */ package org.apache.brooklyn.core.util.internal.ssh; -import static brooklyn.util.net.Networking.checkPortValid; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.net.Networking.checkPortValid; import java.io.File; import java.util.Map; import java.util.Set; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.os.Os; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshTool.java index 4361f46..95bc7c3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/SshTool.java @@ -26,10 +26,11 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.time.Duration; + import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.time.Duration; /** * Defines the methods available on the various different implementations of SSH, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliTool.java index 5fe0408..91570a5 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliTool.java @@ -27,18 +27,18 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ssh.SshAbstractTool; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.internal.ssh.cli.SshCliTool; import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.BashStringEscapes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.StringEscapes.BashStringEscapes; -import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; 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/util/internal/ssh/process/ProcessTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessTool.java index 8f33143..a06b70b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessTool.java @@ -28,21 +28,20 @@ import java.io.OutputStream; import java.util.List; import java.util.Map; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ssh.ShellAbstractTool; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.SshException; 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.os.Os; +import org.apache.brooklyn.util.stream.StreamGobbler; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; -import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.text.Strings; - import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjTool.java b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjTool.java index 8262729..fbe71cb 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjTool.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjTool.java @@ -54,21 +54,20 @@ import org.apache.brooklyn.core.util.internal.ssh.BackoffLimitedRetryHandler; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.SshAbstractTool; import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeTimeoutException; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.stream.StreamGobbler; +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.commons.io.input.ProxyInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeTimeoutException; -import brooklyn.util.io.FileUtil; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/javalang/ReflectionScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/javalang/ReflectionScanner.java b/core/src/main/java/org/apache/brooklyn/core/util/javalang/ReflectionScanner.java index e0b824a..52ceacc 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/javalang/ReflectionScanner.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/javalang/ReflectionScanner.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; import java.util.Set; +import org.apache.brooklyn.util.text.Strings; import org.reflections.ReflectionUtils; import org.reflections.Reflections; import org.reflections.Store; @@ -37,8 +38,6 @@ import org.reflections.util.FilterBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.text.Strings; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/javalang/UrlClassLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/javalang/UrlClassLoader.java b/core/src/main/java/org/apache/brooklyn/core/util/javalang/UrlClassLoader.java index afd0c8e..d4efd1d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/javalang/UrlClassLoader.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/javalang/UrlClassLoader.java @@ -24,8 +24,7 @@ import java.net.URLClassLoader; import java.util.Arrays; import org.apache.brooklyn.core.util.ResourceUtils; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; /** like URLClassLoader (and delegates to it) but: * * has a nice toString http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreForTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreForTasks.java b/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreForTasks.java index 7e805b0..4afb3ed 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreForTasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreForTasks.java @@ -24,10 +24,9 @@ import java.util.Set; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.Tasks; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreWithOwners.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreWithOwners.java b/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreWithOwners.java index 0144d4d..37fe0e0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreWithOwners.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/mutex/SemaphoreWithOwners.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; 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/util/osgi/Osgis.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/core/util/osgi/Osgis.java index 849a33b..9dc56e3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/osgi/Osgis.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/osgi/Osgis.java @@ -59,19 +59,18 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.osgi.Osgis; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Urls; +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.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Joiner;
