http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java index fc9ad37..dbe8ea9 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -44,7 +44,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.BrooklynTaskTags; @@ -52,6 +51,8 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.Lifecycle; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; @@ -59,7 +60,6 @@ import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import brooklyn.entity.basic.ServiceStateLogic; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Changeable; import brooklyn.entity.trait.FailingEntity; import brooklyn.event.SensorEvent;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java index 3d92be1..ccf338a 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -28,17 +28,17 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java index 251a249..820728c 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -31,6 +31,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.BlockingEntity; @@ -41,13 +44,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java index 9ce810a..5de6625 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java @@ -29,6 +29,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -36,11 +38,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Group; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java index d5ed6db..9d34ebe 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java @@ -24,13 +24,13 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java index cbf5ec3..48e4438 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -18,6 +18,10 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; @@ -26,13 +30,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/GroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupTest.java b/core/src/test/java/brooklyn/entity/group/GroupTest.java index ac1138b..ea5e562 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupTest.java @@ -20,6 +20,9 @@ package brooklyn.entity.group; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -29,12 +32,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index 1731391..95fa3a4 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.entity.TestEntity; @@ -32,10 +34,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.event.Sensor; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java index 5517292..e86c662 100644 --- a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.group; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java index 81995162..e021f10 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java @@ -20,13 +20,13 @@ package brooklyn.entity.group.zoneaware; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java index 6d7ce86..f24886f 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java @@ -24,12 +24,12 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/hello/HelloEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/hello/HelloEntity.java b/core/src/test/java/brooklyn/entity/hello/HelloEntity.java index 4786d4a..bf4d08b 100644 --- a/core/src/test/java/brooklyn/entity/hello/HelloEntity.java +++ b/core/src/test/java/brooklyn/entity/hello/HelloEntity.java @@ -18,13 +18,14 @@ */ package brooklyn.entity.hello; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; + import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.BasicSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java index 7771426..01b998b 100644 --- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java @@ -33,6 +33,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.Task; import org.slf4j.Logger; @@ -44,8 +46,6 @@ import org.testng.collections.Lists; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.location.basic.SimulatedLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java index a58183e..1fbfe38 100644 --- a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java @@ -31,6 +31,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -39,8 +42,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/proxying/BasicEntityTypeRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/BasicEntityTypeRegistryTest.java b/core/src/test/java/brooklyn/entity/proxying/BasicEntityTypeRegistryTest.java index 6653095..a31e524 100644 --- a/core/src/test/java/brooklyn/entity/proxying/BasicEntityTypeRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/BasicEntityTypeRegistryTest.java @@ -21,11 +21,12 @@ package brooklyn.entity.proxying; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; public class BasicEntityTypeRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java index a450b91..91756dc 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java index 6ef796a..8a0562a 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java @@ -25,15 +25,16 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Set; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Application; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynTaskTags; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java b/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java index bb50de9..004d02d 100644 --- a/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java @@ -23,6 +23,9 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; @@ -32,8 +35,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.ManagementContextInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java index 7caf02e..3687b2a 100644 --- a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java @@ -19,17 +19,17 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.util.text.Strings; public class ActivePartialRebindTest extends RebindTestFixtureWithApp { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindVersionTest.java b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindVersionTest.java index 011b6b1..be5d129 100644 --- a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindVersionTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindVersionTest.java @@ -22,12 +22,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.catalog.CatalogItem; + import brooklyn.catalog.internal.CatalogTestUtils; -import brooklyn.entity.Entity; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/CheckpointEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/CheckpointEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/CheckpointEntityTest.java index c43aabb..2ea4f01 100644 --- a/core/src/test/java/brooklyn/entity/rebind/CheckpointEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/CheckpointEntityTest.java @@ -25,15 +25,15 @@ import java.util.Collections; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java index 8b74054..1756e65 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java @@ -32,17 +32,17 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.catalog.internal.CatalogInitialization; -import brooklyn.entity.Application; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.Sensors; import brooklyn.management.internal.LocalManagementContext; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.test.TestResourceUnavailableException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java index f41bf4f..91cee54 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java @@ -36,6 +36,7 @@ import org.testng.annotations.Test; import brooklyn.camp.lite.CampPlatformWithJustBrooklynMgmt; import brooklyn.camp.lite.TestAppAssemblyInstantiator; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.management.ManagementContext; @@ -45,7 +46,6 @@ import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java index 6ac7e0e..2cf4f24 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java @@ -27,12 +27,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.camp.lite.CampPlatformWithJustBrooklynMgmt; + +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindDynamicGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindDynamicGroupTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindDynamicGroupTest.java index 0bbaa98..fc94616 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindDynamicGroupTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindDynamicGroupTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertEquals; import java.util.Collection; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java index 857a99b..19ead60 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -26,6 +26,8 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; @@ -40,13 +42,11 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java index 11170de..d7ad132 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java @@ -25,6 +25,8 @@ import java.io.File; import java.io.FileReader; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -33,11 +35,9 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; -import brooklyn.entity.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.util.config.ConfigBag; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index d1fceec..c739175 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -35,6 +35,14 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.rebind.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.EntityMemento; @@ -45,17 +53,11 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; -import brooklyn.entity.Group; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Resizable; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index c2ca460..656ec29 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -27,6 +27,11 @@ import java.io.File; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.rebind.RebindManager; +import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; +import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.policy.Enricher; @@ -40,15 +45,11 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.config.ConfigMap; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import brooklyn.entity.rebind.RebindEntityTest.MyEntityImpl; -import brooklyn.entity.rebind.RebindManager.RebindFailureMode; -import brooklyn.entity.trait.Identifiable; import brooklyn.event.AttributeSensor; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java index a8c5692..5afc3fa 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java @@ -24,6 +24,8 @@ import java.net.URL; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; @@ -35,10 +37,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; -import brooklyn.entity.Feed; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.function.FunctionFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java index d67648e..ee41969 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; @@ -37,8 +39,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Feed; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.management.internal.LocalManagementContext; import brooklyn.util.http.BetterMockWebServer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java index 360b183..44551fe 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java @@ -22,16 +22,16 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.test.Asserts; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java index 1a0f958..721cea0 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -27,6 +27,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.rebind.RebindContext; +import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.mementos.LocationMemento; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; @@ -36,7 +39,6 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java index c3073d3..e0aa57a 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -25,6 +25,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.mementos.TreeNode; @@ -34,12 +37,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.dto.MementosGenerators; -import brooklyn.entity.trait.Identifiable; import brooklyn.util.collections.MutableSet; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java index d1ec74d..6b8193c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java @@ -22,13 +22,13 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.Test; -import brooklyn.entity.Entity; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.util.task.BasicTask; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java index 6a9e4b0..0682e3c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindOptions.java @@ -20,6 +20,7 @@ package brooklyn.entity.rebind; import java.io.File; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.management.ManagementContext; import brooklyn.entity.rebind.persister.PersistenceObjectStore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java index 6e10bf9..6020618 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -25,6 +25,9 @@ import static org.testng.Assert.assertTrue; import java.util.Map; +import org.apache.brooklyn.api.entity.Group; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; @@ -35,12 +38,9 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.entity.Group; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEnricherTest.MyEnricher; import brooklyn.location.Location; import brooklyn.location.basic.Locations; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java index e7a8ee7..c4573c5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -31,6 +31,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindManager; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.management.ManagementContext; @@ -39,7 +42,6 @@ import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.StartableApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java index 9bbabee..56834bc 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.proxying.EntitySpec; public class RebindTestFixtureWithApp extends RebindTestFixture<TestApplication> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index 16486c2..4309489 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -27,6 +27,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; +import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.management.ha.ManagementNodeState; @@ -38,15 +43,12 @@ import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.Application; -import brooklyn.entity.Entity; import brooklyn.entity.rebind.Dumpers.Pointer; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.entity.trait.Identifiable; import brooklyn.location.Location; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java b/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java index 0658c59..ef47a5b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java +++ b/core/src/test/java/brooklyn/entity/rebind/RecordingRebindExceptionHandler.java @@ -22,8 +22,10 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.entity.rebind.RebindManager; -import brooklyn.entity.Entity; import brooklyn.location.Location; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index d437a7a..5db72d8 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -23,6 +23,10 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoPersister; @@ -37,14 +41,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.enricher.Enrichers; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.rebind.PersistenceExceptionHandler; import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl; import brooklyn.entity.rebind.RebindContextImpl; -import brooklyn.entity.rebind.RebindManager.RebindFailureMode; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.RecordingRebindExceptionHandler; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index 5cfa30f..fe05964 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -45,17 +45,17 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.brooklyn.api.basic.BrooklynObject; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.catalog.CatalogItem; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogItemDtoAbstract; import brooklyn.catalog.internal.CatalogTestUtils; -import brooklyn.entity.Entity; -import brooklyn.entity.Feed; import brooklyn.entity.basic.Entities; import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoaderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoaderTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoaderTest.java index b23f1bd..95f28db 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoaderTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerLoaderTest.java @@ -22,9 +22,9 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.testng.annotations.Test; -import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java index c9dd0ea..d560267 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -25,6 +25,11 @@ import java.io.File; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; +import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; +import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; @@ -36,12 +41,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; -import brooklyn.entity.rebind.BrooklynObjectType; -import brooklyn.entity.rebind.PersistenceExceptionHandler; import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl; -import brooklyn.entity.rebind.RebindExceptionHandler; -import brooklyn.entity.rebind.RebindManager.RebindFailureMode; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.entity.rebind.RebindTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/trait/FailingEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java index bf4af6f..4d06fc4 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java @@ -20,12 +20,12 @@ package brooklyn.entity.trait; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.config.ConfigKey; -import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.ImplementedBy; import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java index d96c637..5a9fc21 100644 --- a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.trait; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity.RecordingEventListener; import brooklyn.location.basic.SimulatedLocation; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java b/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java index 78c473c..fb8f620 100644 --- a/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java +++ b/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java @@ -20,6 +20,7 @@ package brooklyn.event.feed; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -27,7 +28,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import brooklyn.management.internal.LocalManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/PollerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/PollerTest.java b/core/src/test/java/brooklyn/event/feed/PollerTest.java index 8cba861..fc799e0 100644 --- a/core/src/test/java/brooklyn/event/feed/PollerTest.java +++ b/core/src/test/java/brooklyn/event/feed/PollerTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java index 0402b02..70e02e2 100644 --- a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java @@ -29,6 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; +import org.apache.brooklyn.api.entity.Feed; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -39,11 +42,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.Feed; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityInternal.FeedSupport; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java index 8b8d3c2..fca199a 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertTrue; import java.net.URI; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -30,8 +32,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java index 2556310..e444735 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java @@ -25,6 +25,8 @@ import java.net.URL; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,9 +39,7 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityInternal.FeedSupport; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.FeedConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java index e8787a0..1afab0d 100644 --- a/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertTrue; import java.util.Arrays; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -35,8 +37,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityInternal.FeedSupport; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.event.feed.function.FunctionFeedTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java index a1d5d1a..5206abe 100644 --- a/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java @@ -21,6 +21,9 @@ package brooklyn.event.feed.ssh; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -34,10 +37,7 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.basic.EntityInternal.FeedSupport; -import brooklyn.entity.proxying.EntityInitializer; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java index 6054c37..9d6ec04 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -20,14 +20,14 @@ package brooklyn.event.feed.windows; import java.util.Map; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppLiveTestSupport; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java index ecc7711..647f6de 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java @@ -26,6 +26,8 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Iterator; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -35,8 +37,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.basic.EntityLocal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java index a7d5898..9517b47 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertNotEquals; import java.io.File; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ha.MementoCopyMode; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.entity.rebind.RebindTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java index cb5efcc..4ae80cb 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java @@ -21,6 +21,7 @@ package brooklyn.location.basic; import java.io.File; import java.util.List; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -29,7 +30,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; import brooklyn.location.LocationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java index e648534..dce9b75 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java @@ -33,6 +33,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.api.entity.proxying.EntityInitializer; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -40,17 +44,13 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.entity.Effector; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTaskTest; import brooklyn.entity.effector.Effectors; -import brooklyn.entity.proxying.EntityInitializer; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.MachineDetails; import brooklyn.location.MachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java index 7fcac6d..193a31b 100644 --- a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java +++ b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java @@ -20,12 +20,12 @@ package brooklyn.location.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java b/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java index 264978c..a39c9dc 100644 --- a/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java +++ b/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java @@ -21,6 +21,7 @@ package brooklyn.location.cloud; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.cloud.names.AbstractCloudMachineNamer; import brooklyn.location.cloud.names.BasicCloudMachineNamer; import brooklyn.location.cloud.names.CloudMachineNamer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java b/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java index 328db19..e901e33 100644 --- a/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java +++ b/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java @@ -18,6 +18,7 @@ */ package brooklyn.location.cloud; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.cloud.names.CustomMachineNamer; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java index 8d2fa39..f1716b2 100644 --- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java +++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java @@ -21,6 +21,8 @@ package brooklyn.management.entitlement; import java.io.IOException; import java.net.URI; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; @@ -31,11 +33,9 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import brooklyn.config.BrooklynProperties; -import brooklyn.entity.Application; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.management.entitlement.Entitlements; import brooklyn.management.entitlement.NotEntitledException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java index 95e7c6c..783adc7 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java @@ -21,6 +21,8 @@ package brooklyn.management.entitlement; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.entitlement.EntitlementManager; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -29,11 +31,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.entity.Application; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java index 2a7d41f..b89c349 100644 --- a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java +++ b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java @@ -18,6 +18,8 @@ */ package brooklyn.management.entitlement; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; @@ -29,11 +31,9 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import brooklyn.config.BrooklynProperties; -import brooklyn.entity.Application; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.management.entitlement.Entitlements.EntityAndItem; import brooklyn.management.entitlement.Entitlements.StringAndArgument; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a76dac4f/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java index 5018e7d..b24b84f 100644 --- a/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java +++ b/core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerInMemoryTest.java @@ -21,6 +21,8 @@ package brooklyn.management.ha; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -29,9 +31,7 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.entity.Entity; import brooklyn.entity.basic.EntityInternal; -import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.persister.InMemoryObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.location.Location;
