http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java index 0802b22..86da58c 100644 --- a/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/java/JmxAttributeSensor.java @@ -25,13 +25,14 @@ import javax.management.ObjectName; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; +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.entity.effector.AddSensor; import brooklyn.entity.java.UsesJmx; @@ -41,7 +42,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.event.feed.jmx.JmxHelper; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Functions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java index 8d15270..b69631e 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java +++ b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandEffector.java @@ -22,9 +22,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.ParameterType; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.effector.AddEffector; @@ -33,8 +35,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.effector.Effectors.EffectorBuilder; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.entity.software.SshEffectorTasks.SshEffectorTaskFactory; -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/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java index 1b6e99b..8091d97 100644 --- a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java +++ b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java @@ -22,12 +22,15 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.config.ConfigKey; 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.os.Os; +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.SoftwareProcess; import brooklyn.entity.effector.AddSensor; @@ -36,9 +39,6 @@ import brooklyn.entity.software.java.JmxAttributeSensor; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; import brooklyn.event.feed.ssh.SshValueFunctions; -import brooklyn.util.collections.MutableMap; -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/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java b/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java index 310f855..5dcdfc4 100644 --- a/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java +++ b/software/base/src/main/java/brooklyn/entity/software/winrm/WindowsPerformanceCounterSensors.java @@ -23,16 +23,16 @@ import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.windows.WindowsPerformanceCounterFeed; -import brooklyn.util.text.Strings; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/event/feed/jmx/JmxFeed.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxFeed.java b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxFeed.java index 4e7871d..4d04ee2 100644 --- a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxFeed.java +++ b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxFeed.java @@ -32,10 +32,11 @@ import javax.management.NotificationListener; import javax.management.ObjectName; 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.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.AbstractFeed; @@ -43,7 +44,6 @@ import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; -import brooklyn.util.time.Duration; import com.google.common.collect.HashMultimap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java index f809d31..7a4a3a0 100644 --- a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java +++ b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxHelper.java @@ -18,8 +18,8 @@ */ package brooklyn.event.feed.jmx; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import groovy.time.TimeDuration; import java.io.IOException; @@ -62,18 +62,18 @@ import javax.net.ssl.TrustManager; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.util.crypto.SslTrustUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.java.JmxSupport; import brooklyn.entity.java.UsesJmx; -import brooklyn.util.crypto.SslTrustUtils; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; import brooklyn.util.jmx.jmxmp.JmxmpAgent; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/event/feed/jmx/JmxNotificationSubscriptionConfig.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxNotificationSubscriptionConfig.java b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxNotificationSubscriptionConfig.java index 4dcfc3d..6fda0b6 100644 --- a/software/base/src/main/java/brooklyn/event/feed/jmx/JmxNotificationSubscriptionConfig.java +++ b/software/base/src/main/java/brooklyn/event/feed/jmx/JmxNotificationSubscriptionConfig.java @@ -24,9 +24,9 @@ import javax.management.NotificationFilter; import javax.management.ObjectName; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableList; import brooklyn.event.feed.FeedConfig; -import brooklyn.util.collections.MutableList; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java index 7a8b099..8edeac0 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.Map; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,8 +31,6 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index b3d9c10..3775c57 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 46f0d6a..003e25f 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -25,6 +25,9 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.StringShortener; +import org.apache.brooklyn.util.text.Strings; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,9 +39,6 @@ import com.google.common.collect.ImmutableMap; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.StringShortener; -import brooklyn.util.text.Strings; /** * Runs a test with many different distros and versions. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java index 257cacf..9dfbc72 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.CollectionFunctionals; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -30,8 +31,8 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.collections.CollectionFunctionals; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcess.java b/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcess.java index bf93dbe..8f8f73d 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcess.java +++ b/software/base/src/test/java/brooklyn/entity/basic/DoNothingSoftwareProcess.java @@ -19,8 +19,7 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; - -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; @ImplementedBy(DoNothingSoftwareProcessImpl.class) public interface DoNothingSoftwareProcess extends SoftwareProcess { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java index ab59e39..b74543c 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityLatchTest.java @@ -29,13 +29,13 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.TaskInternal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.SoftwareProcessEntityTest.MyService; import brooklyn.entity.basic.SoftwareProcessEntityTest.SimulatedDriver; @@ -43,9 +43,8 @@ import brooklyn.event.basic.DependentConfiguration; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index 7a1deb4..02dfa43 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -40,11 +40,20 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +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.net.UserAndHostAndPort; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.jclouds.util.Throwables2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +66,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters.RestartMachineMode; @@ -75,15 +83,6 @@ import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.PropagatedRuntimeException; -import brooklyn.util.net.UserAndHostAndPort; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; - public class SoftwareProcessEntityTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index aadb1ea..66cd818 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -36,6 +36,11 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.BrooklynNetworkUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.yaml.Yamls; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -46,12 +51,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.stream.Streams; -import brooklyn.util.yaml.Yamls; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index f8fb978..f0f006f 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -26,6 +26,11 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.os.Os; +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 org.testng.Assert; @@ -34,11 +39,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess.ChildStartableMode; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java index 9f7c290..a13e335 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/MyEntityImpl.java @@ -20,20 +20,19 @@ package brooklyn.entity.basic.lifecycle; import java.util.List; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.basic.SoftwareProcessDriver; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Identifiers; public class MyEntityImpl extends SoftwareProcessImpl implements MyEntity { @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java index aedc116..d930a52 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/NaiveScriptRunnerTest.java @@ -39,10 +39,9 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.BrooklynTaskTags.WrappedStream; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java index 108e9d5..17b4184 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -45,8 +46,6 @@ import brooklyn.event.feed.function.FunctionPollConfig; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.time.Duration; - import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java index 83c7dec..002d4b2 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java @@ -34,10 +34,14 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.sshj.SshjTool; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.stream.StreamGobbler; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -47,11 +51,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.stream.StreamGobbler; - import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java index a961208..1c31a34 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java @@ -24,6 +24,9 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -32,10 +35,8 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index e473f52..fe28a4a 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -38,8 +38,18 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.slf4j.Logger; @@ -67,17 +77,6 @@ import org.apache.brooklyn.location.basic.Locations; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Functionals; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.net.Networking; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; - import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index 7b3c8ea..49cf380 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -26,7 +26,12 @@ import java.util.List; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -41,12 +46,6 @@ import brooklyn.event.feed.ConfigToAttributes; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - public class BrooklynNodeTest { // TODO Need test for copying/setting classpath http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java index 749a9cb..574194f 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/MockBrooklynNode.java @@ -22,8 +22,8 @@ import java.util.Collection; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.brooklynnode.CallbackEntityHttpClient.Request; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java index 07ee20e..40dac72 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java @@ -33,6 +33,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.time.Duration; import org.apache.http.client.methods.HttpPost; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,8 +52,6 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; -import brooklyn.util.collections.MutableList; -import brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java index 2b65f58..3ec7b8f 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefLiveTestSupport.java @@ -34,9 +34,8 @@ import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.EntityInternal; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.io.FileUtil; -import brooklyn.util.stream.InputStreamSupplier; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.stream.InputStreamSupplier; import com.google.common.base.Throwables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java index 1d175b1..3c957da 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java @@ -24,6 +24,9 @@ import java.io.IOException; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.stream.StreamGobbler; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -33,9 +36,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; /** Many tests expect knife on the path, but none require any configuration beyond that. * They will use the Brooklyn registered account (which has been set up with mysql cookbooks and more). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java index 4c33a62..41ce8c9 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/ChefSoloDriverToyMySqlEntity.java @@ -20,8 +20,10 @@ package brooklyn.entity.chef.mysql; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.chef.ChefConfig; @@ -30,8 +32,6 @@ import brooklyn.entity.chef.ChefSoloDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.ssh.SshFeed; import brooklyn.event.feed.ssh.SshPollConfig; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; @Deprecated /** @deprecated since 0.7.0 use see examples {Dynamic,Typed}ToyMySqlEntityChef */ public class ChefSoloDriverToyMySqlEntity extends SoftwareProcessImpl implements ChefConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/chef/mysql/DynamicToyMySqlEntityChef.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/DynamicToyMySqlEntityChef.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/DynamicToyMySqlEntityChef.java index 94c1244..d9601b4 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/DynamicToyMySqlEntityChef.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/DynamicToyMySqlEntityChef.java @@ -20,13 +20,13 @@ package brooklyn.entity.chef.mysql; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.chef.ChefConfig; import brooklyn.entity.chef.ChefConfigs; import brooklyn.entity.chef.ChefEntity; -import brooklyn.util.collections.MutableMap; /** Builds up a MySql entity via chef using specs only */ public class DynamicToyMySqlEntityChef implements ChefConfig { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/chef/mysql/TypedToyMySqlEntityChef.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/mysql/TypedToyMySqlEntityChef.java b/software/base/src/test/java/brooklyn/entity/chef/mysql/TypedToyMySqlEntityChef.java index 05e3e4d..ba428d2 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/mysql/TypedToyMySqlEntityChef.java +++ b/software/base/src/test/java/brooklyn/entity/chef/mysql/TypedToyMySqlEntityChef.java @@ -18,9 +18,10 @@ */ package brooklyn.entity.chef.mysql; +import org.apache.brooklyn.util.git.GithubUrls; + import brooklyn.entity.chef.ChefConfig; import brooklyn.entity.chef.ChefEntityImpl; -import brooklyn.util.git.GithubUrls; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java index 02e63da..68e70ca 100644 --- a/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java +++ b/software/base/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesMultiLocationTest.java @@ -40,8 +40,7 @@ import brooklyn.entity.basic.SoftwareProcess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.MultiLocation; - -import brooklyn.test.Asserts; +import org.apache.brooklyn.test.Asserts; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java index 2a791fd..2041cb9 100644 --- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java @@ -25,6 +25,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -41,8 +43,6 @@ import brooklyn.event.feed.jmx.JmxFeed; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.JmxService; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java index f5213d9..bfe8af8 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java @@ -43,12 +43,12 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; import brooklyn.util.jmx.jmxmp.JmxmpAgent; -import brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java index 101223e..30c1c99 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java @@ -26,7 +26,11 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -40,11 +44,6 @@ import brooklyn.entity.basic.lifecycle.MyEntity; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java index 97df90b..5e55208 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java @@ -23,6 +23,11 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -31,11 +36,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx.JmxAgentModes; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; @Test public class JmxSupportTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index eaabfed..48edf4e 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -28,6 +28,8 @@ import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -43,9 +45,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java index 067f86e..da65c68 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java @@ -46,7 +46,10 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.crypto.FluentKeySigner; import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.crypto.SslTrustUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -60,9 +63,6 @@ import brooklyn.event.feed.jmx.JmxHelper; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.crypto.SslTrustUtils; import brooklyn.util.jmx.jmxmp.JmxmpAgent; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java index c33e4f9..f1085e2 100644 --- a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityEc2LiveTest.java @@ -23,12 +23,12 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.test.Asserts; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.test.Asserts; public class MachineEntityEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index db5da66..0041ee9 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -41,8 +42,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index a7a8abe..38bb060 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; import com.google.common.base.CaseFormat; @@ -34,7 +35,6 @@ import com.google.common.collect.ImmutableList; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Attributes; -import brooklyn.util.collections.MutableMap; public class ServerPoolLiveTest extends AbstractServerPoolTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index 55b1df7..d01354c 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -44,8 +45,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.dynamic.DynamicLocation; -import brooklyn.util.collections.MutableMap; - public class ServerPoolLocationResolverTest { private LocalManagementContext managementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java index 5534959..a2d5018 100644 --- a/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java +++ b/software/base/src/test/java/brooklyn/entity/service/SystemServiceEnricherTest.java @@ -37,10 +37,9 @@ import brooklyn.entity.effector.EffectorTasks; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; - -import brooklyn.test.Asserts; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index 654597b..126064e 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -21,7 +21,6 @@ package brooklyn.entity.software; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; @@ -31,6 +30,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java index c143adf..913cefa 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -30,7 +30,9 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.TaskInternal; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -54,9 +56,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.jclouds.BailOutJcloudsLocation; -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; - public class MachineLifecycleEffectorTasksTest { public static boolean canStop(StopMode stopMode, boolean isEntityStopped) { BasicEntityImpl entity = new BasicEntityImpl(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index f0a4364..8a1fc22 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -30,6 +30,8 @@ import org.apache.brooklyn.core.util.task.ssh.SshFetchTaskWrapper; import org.apache.brooklyn.core.util.task.ssh.SshPutTaskWrapper; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.exceptions.PropagatedRuntimeException; +import org.apache.brooklyn.util.net.Urls; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,9 +45,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.exceptions.PropagatedRuntimeException; -import brooklyn.util.net.Urls; - import com.google.common.io.Files; public class SshEffectorTasksTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index 8ae262b..debcdd8 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; -import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java index 12266b5..3157733 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java @@ -23,6 +23,10 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -37,11 +41,6 @@ import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java index 8e1ee2e..f1feeea 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityBuilder.java @@ -42,11 +42,10 @@ import brooklyn.entity.software.SshEffectorTasks; import org.apache.brooklyn.location.basic.BasicOsDetails.OsVersions; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.ComparableVersion; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.ComparableVersion; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Predicates; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java index 2299831..75684f5 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/DynamicToyMySqlEntityTest.java @@ -24,9 +24,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; - import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class DynamicToyMySqlEntityTest extends AbstractToyMySqlEntityTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index 6316d03..ad0aa80 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -31,6 +31,8 @@ import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -43,9 +45,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; - import com.google.common.collect.ImmutableList; public class SshCommandIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java index ba1050d..3792036 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java @@ -46,6 +46,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; @@ -68,10 +69,11 @@ import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.ConfigToAttributes; + import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; + import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java index fda9f15..91bed65 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java @@ -34,6 +34,8 @@ import javax.management.ObjectName; import javax.management.StandardEmitterMBean; import org.apache.brooklyn.test.TestUtils; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.jclouds.util.Throwables2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,8 +46,6 @@ import org.testng.collections.Lists; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java index 433370a..b09f64a 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java @@ -26,16 +26,17 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.java.UsesJmx; @@ -49,7 +50,6 @@ import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index 6fbbb98..a0b96ee 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -34,8 +34,10 @@ import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.management.internal.UsageListener.ApplicationMetadata; import org.apache.brooklyn.core.management.usage.ApplicationUsage; import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -45,8 +47,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.EntityProxy; -import brooklyn.test.Asserts; -import brooklyn.util.time.Time; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java index 82ff588..252d8e4 100644 --- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java @@ -43,9 +43,8 @@ import brooklyn.entity.basic.SoftwareProcessEntityTest; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.test.Asserts; -import brooklyn.util.time.Time; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java b/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java index 4ac1631..7514be4 100644 --- a/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java +++ b/software/base/src/test/java/brooklyn/management/usage/RecordingLegacyUsageListener.java @@ -23,8 +23,7 @@ import java.util.Map; import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; - -import brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java b/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java index e5868a8..d9908f5 100644 --- a/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java +++ b/software/base/src/test/java/brooklyn/management/usage/RecordingUsageListener.java @@ -22,8 +22,7 @@ import java.util.List; import org.apache.brooklyn.core.management.usage.ApplicationUsage.ApplicationEvent; import org.apache.brooklyn.core.management.usage.LocationUsage.LocationEvent; - -import brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index a143558..0d94fae 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -37,8 +38,6 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.management.internal.UsageManager; -import brooklyn.test.Asserts; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java index 105479d..f65958e 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/MachineDetailsEc2LiveTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import com.google.common.collect.ImmutableList; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.trait.Startable; -import brooklyn.util.collections.MutableMap; // This test really belongs in brooklyn-location but depends on AbstractEc2LiveTest in brooklyn-software-base public class MachineDetailsEc2LiveTest extends AbstractEc2LiveTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java index 103c3f0..bac73f7 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationTest.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.util.net.Networking; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.util.net.Networking; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java index fee8f02..89034c2 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/DatastoreMixins.java @@ -25,15 +25,15 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.text.Strings; public class DatastoreMixins { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java index 264611e..8a358bc 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java @@ -20,13 +20,15 @@ package org.apache.brooklyn.entity.database.crate; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; + import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java index df65398..0edb37d 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.entity.database.crate; +import org.apache.brooklyn.util.guava.Functionals; + import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; @@ -27,7 +29,6 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.jmx.JmxFeed; -import brooklyn.util.guava.Functionals; public class CrateNodeImpl extends SoftwareProcessImpl implements CrateNode{
