http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java index 5e535e4..537e75a 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java @@ -18,11 +18,10 @@ */ package org.apache.brooklyn.location.jclouds; -import brooklyn.config.ConfigKey; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; import org.jclouds.compute.options.TemplateOptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java index de9f950..8736434 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java @@ -31,10 +31,14 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; +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.exceptions.Exceptions; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.StatementList; import org.mockito.Mockito; @@ -52,7 +56,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; import brooklyn.config.BrooklynProperties; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -60,10 +63,6 @@ import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.location.jclouds.JcloudsLocation.UserCreation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; - /** * @author Shane Witbeck */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java index 74b408c..9b0c873 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLoginLiveTest.java @@ -29,10 +29,9 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java index 90c1bbb..83197a3 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java @@ -19,13 +19,12 @@ package org.apache.brooklyn.location.jclouds; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.text.Strings; - public class JcloudsMachineNamerTest { private static final Logger log = LoggerFactory.getLogger(JcloudsMachineNamerTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshingLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshingLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshingLiveTest.java index 48ce9cf..1f38361 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshingLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshingLiveTest.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.location.jclouds; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java index 9ae5729..c30c50e 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java @@ -25,16 +25,15 @@ import java.util.Map; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.location.basic.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Identifiers; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java index b08a087..57deb1c 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StandaloneJcloudsLiveTest.java @@ -27,6 +27,7 @@ import java.util.Properties; import java.util.Set; import java.util.UUID; +import org.apache.brooklyn.util.text.Identifiers; import org.jclouds.Constants; import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; @@ -50,7 +51,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; -import brooklyn.util.text.Identifiers; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizerTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizerTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizerTest.java index c6025ba..aafcf6e 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizerTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizerTest.java @@ -55,8 +55,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import org.apache.brooklyn.location.jclouds.JcloudsLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Cidr; public class JcloudsLocationSecurityGroupCustomizerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java index 860a8e3..933c6b2 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertNull; import java.util.List; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.location.jclouds.AbstractJcloudsStubbedLiveTest; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.jclouds.compute.domain.NodeMetadata; @@ -33,13 +34,11 @@ import org.jclouds.domain.LoginCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; - -import brooklyn.config.ConfigKey; import org.apache.brooklyn.location.access.PortForwardManager; import org.apache.brooklyn.location.access.PortForwardManagerImpl; import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation; -import brooklyn.util.net.Cidr; -import brooklyn.util.net.Protocol; +import org.apache.brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.net.Protocol; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java index d302187..c7f0335 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/AbstractJcloudsLocationTest.java @@ -38,10 +38,9 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.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/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy index 9e1e1e9..56bb8fe 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/CarrenzaLocationLiveTest.groovy @@ -31,7 +31,7 @@ import org.apache.brooklyn.location.basic.SshMachineLocation import org.apache.brooklyn.location.jclouds.JcloudsLocation import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation import org.apache.brooklyn.core.management.internal.LocalManagementContext -import brooklyn.util.collections.MutableMap +import org.apache.brooklyn.util.collections.MutableMap import com.google.common.collect.ImmutableList http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/RackspaceLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/RackspaceLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/RackspaceLocationLiveTest.java index 737723a..9bae000 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/RackspaceLocationLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/provider/RackspaceLocationLiveTest.java @@ -27,11 +27,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class RackspaceLocationLiveTest extends AbstractJcloudsLocationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java index 9b6128c..af8dbf2 100644 --- a/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java @@ -18,7 +18,7 @@ */ package brooklyn.enricher; -import static brooklyn.util.JavaGroovyEquivalents.elvis; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java b/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java index 884d568..44e2980 100644 --- a/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java +++ b/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java @@ -32,11 +32,19 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; 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.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.javalang.AtomicReferences; +import org.apache.brooklyn.util.javalang.Boxing; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.math.MathFunctions; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.trait.Startable; @@ -44,14 +52,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.javalang.AtomicReferences; -import brooklyn.util.javalang.Boxing; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.math.MathFunctions; -import brooklyn.util.net.Urls; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Suppliers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java b/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java index 13648af..b70d3b8 100644 --- a/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.javalang.JavaClassNames; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; -import brooklyn.util.javalang.JavaClassNames; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java b/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java index b9688d9..3cd0051 100644 --- a/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java @@ -25,14 +25,14 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; import brooklyn.enricher.basic.YamlRollingTimeWindowMeanEnricher; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java index d86aec0..eb976d9 100644 --- a/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/TimeFractionDeltaEnricher.java @@ -28,10 +28,10 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; /** * Converts an absolute measure of time into a fraction of time, based on the delta between consecutive values http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java index 0d5e066..e4637f5 100644 --- a/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.java @@ -25,14 +25,14 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; import brooklyn.enricher.basic.YamlTimeWeightedDeltaEnricher; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java index 98d814f..56affe1 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.policy.autoscaling; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import groovy.lang.Closure; import java.util.Map; @@ -40,12 +40,12 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.task.Tasks; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Resizable; @@ -55,9 +55,8 @@ import brooklyn.event.basic.BasicNotificationSensor; import org.apache.brooklyn.policy.autoscaling.SizeHistory.WindowSummary; import org.apache.brooklyn.policy.loadbalancing.LoadBalancingPolicy; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java index 0aa8801..b9c587b 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java @@ -20,10 +20,10 @@ package org.apache.brooklyn.policy.autoscaling; import java.util.List; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.TimeWindowedList; -import brooklyn.util.collections.TimestampedValue; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.TimeWindowedList; +import org.apache.brooklyn.util.collections.TimestampedValue; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java index a02285e..e3dc1f9 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.policy.followthesun; -import static brooklyn.util.JavaGroovyEquivalents.elvis; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.util.Collection; import java.util.Map; @@ -47,8 +47,7 @@ import brooklyn.entity.basic.Attributes; import org.apache.brooklyn.policy.followthesun.FollowTheSunPool.ContainerItemPair; import org.apache.brooklyn.policy.loadbalancing.Movable; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java index d7af68a..b28f01a 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.policy.ha; -import static brooklyn.util.time.Time.makeTimeStringRounded; +import static org.apache.brooklyn.util.time.Time.makeTimeStringRounded; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.task.BasicTask; @@ -35,17 +36,15 @@ import org.apache.brooklyn.core.util.task.ScheduledTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java index 4bc1dc1..f9d9e06 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java @@ -23,14 +23,14 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.javalang.JavaClassNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetector.java index 2cca77f..ebcc5eb 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetector.java @@ -20,18 +20,17 @@ package org.apache.brooklyn.policy.ha; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Networking; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.time.Duration; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java index 80feb4c..5511664 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceFailureDetector.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.task.BasicTask; @@ -31,7 +32,6 @@ import org.apache.brooklyn.core.util.task.ScheduledTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; @@ -40,11 +40,12 @@ import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceState; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; + import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; /** * Emits {@link HASensors#ENTITY_FAILED} whenever the parent's default logic ({@link ComputeServiceState}) would detect a problem, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java index d6989d9..a27c123 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java @@ -35,11 +35,11 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; @@ -50,9 +50,8 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.BasicNotificationSensor; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Ticker; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java index 82f8664..950a09e 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java @@ -28,11 +28,11 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; @@ -42,11 +42,10 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.basic.BasicNotificationSensor; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java index e679309..ee2ef07 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java @@ -23,20 +23,18 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ssh.SshTool; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicNotificationSensor; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; - import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +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/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/BalanceableContainer.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/BalanceableContainer.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/BalanceableContainer.java index 451d150..442f790 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/BalanceableContainer.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/BalanceableContainer.java @@ -21,13 +21,13 @@ package org.apache.brooklyn.policy.loadbalancing; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.QuorumCheck; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.util.collections.QuorumCheck; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; /** * Contains worker items that can be moved between this container and others to effect load balancing. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java index 2538bc6..320858b 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroup.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.policy.loadbalancing; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.DynamicGroup; import brooklyn.event.basic.BasicConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java index f437fc8..8e28411 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.policy.loadbalancing; -import static brooklyn.util.JavaGroovyEquivalents.elvis; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.util.Map; import java.util.Map.Entry; @@ -35,17 +35,16 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.EntityInternal; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/Movable.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/Movable.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/Movable.java index 68ba43d..080d3a1 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/Movable.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/Movable.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.policy.loadbalancing; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.MethodEffector; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java index 7c7a9f3..677cee0 100644 --- a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java +++ b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java @@ -28,6 +28,7 @@ import org.apache.brooklyn.core.util.http.BetterMockWebServer; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -39,8 +40,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableList; import com.google.mockwebserver.MockResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java index a01fd17..bceabfc 100644 --- a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java @@ -25,17 +25,17 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.http.BetterMockWebServer; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Attributes; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.mockwebserver.MockResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java b/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java index bd4fa0c..3fecba8 100644 --- a/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java +++ b/policy/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.java @@ -25,21 +25,22 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java index 83f7b33..c9a28c9 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyMetricTest.java @@ -29,6 +29,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.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; import org.apache.brooklyn.test.entity.TestEntity; @@ -39,7 +40,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java index f8f200b..856ac3d 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.LocationSpec; 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.BeforeMethod; import org.testng.annotations.Test; @@ -40,8 +41,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.time.Duration; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java index f91adee..02aaf49 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyReconfigurationTest.java @@ -22,16 +22,16 @@ import static org.apache.brooklyn.policy.autoscaling.AutoScalerPolicyTest.curren import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java index 27441be..dbd4f04 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java @@ -35,8 +35,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestCluster; +import org.apache.brooklyn.util.collections.MutableList; +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; @@ -47,10 +51,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Resizable; import brooklyn.event.basic.BasicNotificationSensor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java index 1928e3c..501c7d9 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -32,8 +32,11 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +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.collections.MutableMap; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -44,15 +47,11 @@ import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SimulatedLocation; - import org.apache.brooklyn.policy.loadbalancing.BalanceableContainer; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntityImpl; import org.apache.brooklyn.policy.loadbalancing.Movable; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Time; import com.google.common.base.Function; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java index 178a9ae..35bf247 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java @@ -37,14 +37,13 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SimulatedLocation; - import org.apache.brooklyn.policy.loadbalancing.BalanceableContainer; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntityImpl; import org.apache.brooklyn.policy.loadbalancing.Movable; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java index 872efab..bfb981e 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java @@ -39,12 +39,11 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SimulatedLocation; - import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; import org.apache.brooklyn.policy.loadbalancing.Movable; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.base.Stopwatch; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetectorTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetectorTest.java index e2d6998..a3d4d1d 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetectorTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ConnectionFailureDetectorTest.java @@ -33,18 +33,19 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.PolicySpec; +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.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java index 3782ccf..636cde4 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java @@ -34,8 +34,10 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,10 +48,7 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.location.basic.SimulatedLocation; - import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java index ca84592..1b8ad83 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorStabilizationTest.java @@ -30,9 +30,12 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -44,10 +47,8 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogicTest; + import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorTest.java index 2ad2d79..d66fce0 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceFailureDetectorTest.java @@ -31,10 +31,14 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; 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.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -47,11 +51,8 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; + import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java index f92603a..24dd0c5 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java @@ -36,10 +36,12 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.javalang.JavaClassNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -58,10 +60,7 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.trait.FailingEntity; import org.apache.brooklyn.location.basic.SimulatedLocation; - import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java index c93612b..ec3bc86 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java @@ -32,9 +32,11 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -44,9 +46,8 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.trait.FailingEntity; + import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; -import brooklyn.test.Asserts; -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/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java index 6257bc9..6bb65fe 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java @@ -31,21 +31,22 @@ 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.event.AttributeSensor; +import org.apache.brooklyn.config.ConfigKey; +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.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Time; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java index 18f6847..ed56504 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java @@ -25,6 +25,8 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; 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; @@ -37,9 +39,8 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.Resizable; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java index c256334..e2289c6 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java @@ -23,7 +23,9 @@ 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.test.Asserts; 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; @@ -31,9 +33,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.DynamicGroup; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java index 8da494c..8e091f3 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.java @@ -27,13 +27,13 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java index a0166f9..257daf0 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.test.Asserts; -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/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntity.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntity.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntity.java index 1937d9a..56a491b 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntity.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntity.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; import brooklyn.entity.basic.MethodEffector; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java index de9da37..95fbc51 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java @@ -29,13 +29,13 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractGroupImpl; import brooklyn.entity.basic.Attributes; -import brooklyn.util.collections.MutableList; -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/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java index 00b665d..95c55c5 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java @@ -26,11 +26,11 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.util.collections.MutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.AbstractEntity; -import brooklyn.util.collections.MutableList; public class MockItemEntityImpl extends AbstractEntity implements MockItemEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index f1e5ae1..747a9c9 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -33,10 +33,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.basic.SupportsPortForwarding; +import org.apache.brooklyn.util.net.Cidr; import org.apache.http.client.HttpClient; import org.apache.http.impl.NoConnectionReuseStrategy; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; @@ -59,7 +61,6 @@ import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; import com.google.gson.JsonObject; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityFunctions; @@ -68,7 +69,6 @@ import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.PollHandler; import brooklyn.event.feed.Poller; import brooklyn.event.feed.http.HttpValueFunctions; -import brooklyn.util.net.Cidr; public class ZabbixFeed extends AbstractFeed { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java index 3104ca3..746247d 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.entity.monitoring.zabbix; 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.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java index 7b2a911..1b1d11b 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java @@ -22,6 +22,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.http.HttpToolResponse; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -30,7 +31,6 @@ import com.google.gson.JsonElement; import brooklyn.event.feed.PollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.event.feed.http.JsonFunctions; -import brooklyn.util.collections.MutableList; public class ZabbixPollConfig<T> extends PollConfig<HttpToolResponse, T, ZabbixPollConfig<T>> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java index ad4f415..f80a7ed 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixServer.java @@ -21,12 +21,12 @@ package org.apache.brooklyn.entity.monitoring.zabbix; import org.apache.brooklyn.api.entity.Entity; 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 com.google.common.base.Predicate; import com.google.common.base.Predicates; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java index a1b4ea8..900da4f 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java @@ -18,8 +18,8 @@ */ package brooklyn.entity.basic; -import static brooklyn.util.JavaGroovyEquivalents.elvis; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis; import java.io.File; import java.io.InputStream; @@ -29,20 +29,19 @@ import java.util.Map; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.text.TemplateProcessor; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.ReaderInputStream; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; -import brooklyn.util.stream.ReaderInputStream; -import brooklyn.util.text.Strings; - import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap;
