http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java index d3f550b..40d66b5 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; public class TestReferencingPolicy extends AbstractPolicy {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java index 8e045ca..3ac7616 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java @@ -24,6 +24,9 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.StringPredicates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,9 +38,6 @@ import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.effector.Effectors; import brooklyn.event.basic.Sensors; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.text.StringPredicates; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java index 5eab943..f63e367 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java @@ -25,6 +25,10 @@ import org.apache.brooklyn.core.management.osgi.OsgiTestResources; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +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.stream.Streams; import java.io.File; import java.io.FileOutputStream; @@ -34,10 +38,6 @@ import java.io.StringReader; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; -import brooklyn.util.stream.ReaderInputStream; -import brooklyn.util.stream.Streams; import com.google.common.io.ByteStreams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 9c36cb0..22f2fc4 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -24,9 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - import org.apache.brooklyn.basic.BrooklynTypes; - import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; @@ -41,8 +39,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.osgi.OsgiVersionMoreEntityTest; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java index 2baf194..576f41d 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java @@ -31,8 +31,9 @@ import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.BasicStartable; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.policy.ha.ServiceRestarter; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index 4cece0a..7a32246 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -42,9 +42,8 @@ import brooklyn.entity.basic.BasicEntity; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java index 7d283a9..e8c122f 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java @@ -40,8 +40,7 @@ import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.test.TestResourceUnavailableException; - -import brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.StringFunctions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseTest.java index 4457cb3..ca754c5 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslParseTest.java @@ -27,10 +27,9 @@ import java.util.List; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.DslParser; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.FunctionWithArgs; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.QuotedString; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import org.testng.annotations.Test; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java index e65710f..a748b4e 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java @@ -44,11 +44,10 @@ import brooklyn.BrooklynVersion; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.cli.Main.LaunchCommand; - -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.exceptions.FatalRuntimeException; -import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.exceptions.FatalRuntimeException; +import org.apache.brooklyn.util.exceptions.UserFacingException; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java index 32111e9..37a61d7 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java @@ -45,9 +45,8 @@ import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; - -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.stream.Streams; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java index 56f691c..a03d13a 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/ItemLister.java @@ -44,11 +44,10 @@ import org.apache.brooklyn.cli.lister.ClassFinder; import org.apache.brooklyn.cli.lister.ItemDescriptors; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.text.TemplateProcessor; - -import brooklyn.util.collections.MutableSet; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java index 7293abf..be123ae 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -44,8 +44,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import brooklyn.BrooklynVersion; -import org.apache.brooklyn.basic.BrooklynTypes; +import org.apache.brooklyn.basic.BrooklynTypes; import org.apache.brooklyn.api.catalog.BrooklynCatalog; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; @@ -84,18 +84,18 @@ import org.apache.brooklyn.launcher.BrooklynServerDetails; import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; import org.apache.brooklyn.rest.security.PasswordHasher; import org.apache.brooklyn.rest.util.ShutdownHandler; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.exceptions.FatalRuntimeException; +import org.apache.brooklyn.util.exceptions.UserFacingException; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.Enums; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.exceptions.FatalRuntimeException; -import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.Enums; -import brooklyn.util.net.Networking; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyShell; import io.airlift.command.Cli; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java index e25b47a..a5fae9d 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java @@ -34,6 +34,8 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.javalang.UrlClassLoader; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; import org.reflections.Reflections; import org.reflections.scanners.FieldAnnotationsScanner; import org.reflections.scanners.SubTypesScanner; @@ -46,8 +48,6 @@ import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.SoftwareProcessImpl; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; import com.google.common.annotations.Beta; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java index abbccde..e5f0c32 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ItemDescriptors.java @@ -26,10 +26,9 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.basic.BrooklynDynamicType; import org.apache.brooklyn.basic.BrooklynTypes; - +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.basic.BrooklynType; import org.apache.brooklyn.api.catalog.Catalog; @@ -38,7 +37,6 @@ import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.location.LocationResolver; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import org.apache.brooklyn.rest.domain.EffectorSummary; @@ -48,8 +46,7 @@ import org.apache.brooklyn.rest.domain.SummaryComparators; import org.apache.brooklyn.rest.transform.EffectorTransformer; import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.transform.SensorTransformer; - -import brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; import com.google.common.base.Strings; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index 44207c1..7d71461 100644 --- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -52,7 +52,13 @@ import org.apache.brooklyn.cli.Main.AppShutdownHandler; import org.apache.brooklyn.cli.Main.GeneratePasswordCommand; import org.apache.brooklyn.cli.Main.LaunchCommand; import org.apache.brooklyn.core.util.ResourceUtils; +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.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.exceptions.UserFacingException; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -70,13 +76,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.time.Duration; - import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java index c32c832..8e64624 100644 --- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java +++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java @@ -24,9 +24,8 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.rest.BrooklynRestApiLauncher; -import brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.Networking; /** launches Javascript GUI programmatically. and used for tests. * see {@link BrooklynRestApiLauncher} for more information. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java index c9d6818..dc7ee73 100644 --- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java +++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.rest.jsgui; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; @@ -30,8 +31,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; -import brooklyn.test.Asserts; - /** Convenience and demo for launching programmatically. */ public class BrooklynJavascriptGuiLauncherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java index 0c21d90..8e711b4 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java @@ -52,6 +52,7 @@ import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl; import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; @@ -71,7 +72,6 @@ import com.google.common.collect.Maps; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; -import brooklyn.config.ConfigKey; import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynShutdownHooks; @@ -96,19 +96,18 @@ import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; import org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider; import org.apache.brooklyn.rest.util.ShutdownHandler; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.exceptions.FatalRuntimeException; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.guava.Maybe; -import brooklyn.util.io.FileUtil; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.exceptions.FatalRuntimeException; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; /** * Example usage is: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java index 82c881f..179655d 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java @@ -62,10 +62,10 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; import brooklyn.BrooklynVersion; import brooklyn.config.BrooklynServerPaths; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.BrooklynNetworkUtils; @@ -89,17 +89,15 @@ import org.apache.brooklyn.rest.filter.RequestTaggingFilter; import org.apache.brooklyn.rest.util.ManagementContextProvider; import org.apache.brooklyn.rest.util.ShutdownHandler; import org.apache.brooklyn.rest.util.ShutdownHandlerProvider; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.io.FileUtil; -import brooklyn.util.javalang.Threads; -import brooklyn.util.logging.LoggingSetup; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; - +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.javalang.Threads; +import org.apache.brooklyn.util.logging.LoggingSetup; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.web.ContextHandlerCollectionHotSwappable; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynDevelopmentModes.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynDevelopmentModes.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynDevelopmentModes.java index 13d2a3b..52a4ed5 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynDevelopmentModes.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynDevelopmentModes.java @@ -21,12 +21,12 @@ package org.apache.brooklyn.launcher.config; import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.os.Os; @Deprecated /** @deprecated since 0.7.0; see BrooklynVersion; * and anyway this was not really used, and if it were, it would be needed in core; autodetection is pretty good */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java index b65e3dd..3f3941c 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java @@ -19,16 +19,15 @@ package org.apache.brooklyn.launcher.config; import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.BrooklynGarbageCollector; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.rest.BrooklynWebConfig; - -import brooklyn.util.internal.BrooklynSystemProperties; -import brooklyn.util.internal.StringSystemProperty; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.internal.BrooklynSystemProperties; +import org.apache.brooklyn.util.internal.StringSystemProperty; +import org.apache.brooklyn.util.time.Duration; /** * Convenience collection of popular global configuration values. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java index eb1052d..b8f5819 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/CustomResourceLocator.java @@ -23,14 +23,14 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import org.apache.brooklyn.config.ConfigMap; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.BrooklynVersion; -import brooklyn.config.ConfigMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; /** class which allows non-standard locators to be registered for URL's being loaded */ public class CustomResourceLocator { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java index 1d14d72..f42b72d 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java @@ -31,10 +31,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; - -import brooklyn.test.Asserts; -import brooklyn.util.os.Os; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java index 698e42f..186bb68 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java @@ -21,10 +21,13 @@ package org.apache.brooklyn.entity.brooklynnode; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -44,10 +47,6 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.launcher.BrooklynWebServer; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; - /** * Test for EntityMirror, launching an in-memory server and ensuring we can mirror. * Here so that we can access the REST server. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java index 933071c..f6bbbc1 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java @@ -25,6 +25,12 @@ import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.Jsonya; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; import org.apache.http.client.HttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,13 +56,6 @@ import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; -import brooklyn.util.collections.Jsonya; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.net.Urls; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; - import com.google.common.collect.Iterables; /** REST-accessible extension of {@link BrooklynNodeTest} */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java index 1806aa9..d4cb091 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java @@ -25,8 +25,11 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.launcher.BrooklynLauncher; +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.os.Os; +import org.apache.brooklyn.util.time.Duration; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -44,9 +47,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.test.Asserts; -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java index 060aa8f..ac3a1cf 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java @@ -39,9 +39,9 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.os.Os; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.util.os.Os; public class BrooklynLauncherRebindCatalogTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java index bfbe81e..1a2f90d 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java @@ -24,8 +24,12 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.launcher.BrooklynLauncher; +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.MutableList; +import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; +import org.apache.brooklyn.util.time.Duration; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -46,10 +50,6 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.FatalConfigurationRuntimeException; -import brooklyn.util.time.Duration; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java index 51d3827..0b7c09c 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java @@ -23,6 +23,9 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; @@ -37,9 +40,6 @@ import brooklyn.config.BrooklynServerPaths; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; import com.google.common.base.Joiner; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java index 5142266..39f2564 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java @@ -24,6 +24,9 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; import static org.testng.Assert.assertEquals; @@ -36,9 +39,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; import brooklyn.entity.rebind.persister.jclouds.JcloudsBlobStoreBasedObjectStore; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; @Test(groups="Live") public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLauncherRebindTestFixture { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index 02521e5..95bb33b 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -46,6 +46,12 @@ import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.exceptions.FatalRuntimeException; +import org.apache.brooklyn.util.io.FileUtil; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.Strings; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -57,13 +63,6 @@ import brooklyn.entity.rebind.RebindTestUtils; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.util.exceptions.FatalRuntimeException; -import brooklyn.util.io.FileUtil; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.text.Strings; - import com.google.api.client.util.Preconditions; import com.google.common.base.Charsets; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java index f743aea..e26b9cd 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java @@ -54,9 +54,8 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; - -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.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java index d145906..9cbc0e6 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java @@ -32,6 +32,8 @@ import java.util.Map; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -39,8 +41,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java index 707d9a7..3c23401 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java @@ -31,7 +31,9 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -49,9 +51,6 @@ import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.BrooklynCampPlatformLauncher; -import brooklyn.test.Asserts; -import brooklyn.util.os.Os; - public abstract class AbstractBlueprintTest { private static final Logger LOG = LoggerFactory.getLogger(AbstractBlueprintTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java index 5695ad5..f26be79 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java @@ -26,12 +26,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import org.apache.brooklyn.util.text.Strings; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; -import brooklyn.util.text.Strings; - import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java index 12d5a9d..8e3d460 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java @@ -26,13 +26,12 @@ import java.util.Map; import javax.annotation.Nullable; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.collections.Jsonya; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; -import brooklyn.config.ConfigKey; -import brooklyn.util.collections.Jsonya; - import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java index fb59a65..62c6717 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.rest.domain; -import brooklyn.config.ConfigKey; import com.google.common.collect.ImmutableMap; + +import org.apache.brooklyn.config.ConfigKey; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/SummaryComparators.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/SummaryComparators.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/SummaryComparators.java index 8d96efd..d940529 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/SummaryComparators.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/SummaryComparators.java @@ -23,9 +23,8 @@ import java.util.Comparator; import javax.annotation.Nonnull; import org.apache.brooklyn.api.basic.BrooklynObject; - -import brooklyn.util.text.NaturalOrderComparator; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.NaturalOrderComparator; +import org.apache.brooklyn.util.text.Strings; /** * Useful comparators for domain objects http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java index 7ab796f..e4ce145 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java @@ -26,13 +26,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.util.collections.Jsonya; import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; -import brooklyn.util.collections.Jsonya; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java b/usage/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java index 6023c02..379cdfc 100644 --- a/usage/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java +++ b/usage/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java @@ -20,12 +20,11 @@ package org.apache.brooklyn.rest.util; import java.io.InputStream; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; - public class RestApiTestUtils { public static <T> T fromJson(String text, Class<T> type) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java b/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java index 4b3ef43..fa3b7ee 100644 --- a/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java +++ b/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java @@ -62,8 +62,7 @@ import org.apache.brooklyn.rest.api.ServerApi; import org.apache.brooklyn.rest.api.UsageApi; import org.apache.brooklyn.rest.api.VersionApi; import org.apache.brooklyn.rest.client.util.http.BuiltResponsePreservingError; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.wordnik.swagger.core.ApiOperation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/util/http/BuiltResponsePreservingError.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/util/http/BuiltResponsePreservingError.java b/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/util/http/BuiltResponsePreservingError.java index bfaee57..fb43c4c 100644 --- a/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/util/http/BuiltResponsePreservingError.java +++ b/usage/rest-client/src/main/java/org/apache/brooklyn/rest/client/util/http/BuiltResponsePreservingError.java @@ -22,12 +22,11 @@ import java.lang.annotation.Annotation; import javax.ws.rs.core.Response; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.jboss.resteasy.client.core.BaseClientResponse; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.specimpl.BuiltResponse; -import brooklyn.util.exceptions.Exceptions; - /** * Allows wrapping a {@link Response} with the stream fully read and closed so that the client can be re-used. * <p> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java index 11847dd..35ef39e 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java @@ -48,9 +48,8 @@ import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.domain.SensorSummary; - -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java index c691efa..a18fe0a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.rest; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigMap; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; import org.apache.brooklyn.rest.security.provider.ExplicitUsersSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java index 5f47438..d9d01bd 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java @@ -40,8 +40,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.WebEntitlementContext; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.sun.jersey.core.util.Base64; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java index cbb803c..eec26de 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java @@ -31,8 +31,7 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.domain.ApiError; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java index 0096e49..39fcee7 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java @@ -41,8 +41,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java index 96eaecb..fd25f83 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Set; import java.util.concurrent.TimeUnit; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -31,6 +32,8 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,8 +42,6 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; import brooklyn.config.BrooklynLogging; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; /** * Handles logging of request information. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/RequestTaggingFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/RequestTaggingFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/RequestTaggingFilter.java index 5a21b8f..883fad8 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/RequestTaggingFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/RequestTaggingFilter.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.rest.filter; import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -26,7 +27,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Identifiers; /** * Tags each request with a probabilistically unique id. Should be included before other http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java index e165ab4..75fd536 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java @@ -37,9 +37,8 @@ import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.time.Duration; public abstract class AbstractBrooklynRestResource implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java index 03a53f0..3cca36d 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java @@ -24,7 +24,6 @@ import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.ACCEPTED; import brooklyn.entity.basic.EntityPredicates; -import brooklyn.util.text.Strings; import java.io.StringReader; import java.net.URI; @@ -80,9 +79,9 @@ import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; - -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 org.apache.brooklyn.util.text.Strings; import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 08ed505..fc1e500 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -61,13 +61,12 @@ import org.apache.brooklyn.rest.domain.CatalogPolicySummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.CatalogTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.StringPredicates; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java index 1d6e961..3be6d48 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EffectorResource.java @@ -46,10 +46,9 @@ import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EffectorTransformer; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.time.Time; @HaHotStateRequired public class EffectorResource extends AbstractBrooklynRestResource implements EffectorApi { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java index f5f43ea..4057587 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityConfigResource.java @@ -26,13 +26,13 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.task.ValueResolver; @@ -41,9 +41,8 @@ import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.EntityTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java index eef52e9..390a1ca 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java @@ -61,9 +61,8 @@ import org.apache.brooklyn.rest.transform.LocationTransformer; import org.apache.brooklyn.rest.transform.LocationTransformer.LocationDetailLevel; import org.apache.brooklyn.rest.transform.TaskTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableList; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.Collections2; import com.google.common.collect.FluentIterable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java index 1dc0bf2..1a9783e 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java @@ -42,11 +42,10 @@ import org.apache.brooklyn.rest.transform.LocationTransformer; import org.apache.brooklyn.rest.transform.LocationTransformer.LocationDetailLevel; import org.apache.brooklyn.rest.util.EntityLocationUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.NaturalOrderComparator; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.NaturalOrderComparator; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java index 0036f3a..de81321 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyConfigResource.java @@ -24,11 +24,10 @@ import java.util.Map; import javax.ws.rs.core.Response; import org.apache.brooklyn.basic.BrooklynObjectInternal; -import brooklyn.config.ConfigKey; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.rest.api.PolicyConfigApi; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java index c5ea74a..6564ad2 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java @@ -38,8 +38,7 @@ import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.ApplicationTransformer; import org.apache.brooklyn.rest.transform.PolicyTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java index 513a07e..77989c3 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ScriptResource.java @@ -20,15 +20,18 @@ package org.apache.brooklyn.rest.resources; import org.apache.brooklyn.rest.api.ScriptApi; import org.apache.brooklyn.rest.domain.ScriptExecutionSummary; -import brooklyn.util.stream.ThreadLocalPrintStream; -import brooklyn.util.stream.ThreadLocalPrintStream.OutputCapturingContext; +import org.apache.brooklyn.util.stream.ThreadLocalPrintStream; +import org.apache.brooklyn.util.stream.ThreadLocalPrintStream.OutputCapturingContext; + import groovy.lang.Binding; import groovy.lang.GroovyShell; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; + import java.util.LinkedHashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java index d8be210..e930069 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java @@ -40,9 +40,8 @@ import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.rest.filter.HaHotStateRequired; import org.apache.brooklyn.rest.transform.SensorTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java index 1fed7c6..7b5cfea 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java @@ -41,7 +41,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.FluentIterable; import brooklyn.BrooklynVersion; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; @@ -61,6 +60,7 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.MementoCopyMode; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.ResourceUtils; @@ -74,16 +74,15 @@ import org.apache.brooklyn.rest.transform.BrooklynFeatureTransformer; import org.apache.brooklyn.rest.transform.HighAvailabilityTransformer; import org.apache.brooklyn.rest.util.ShutdownHandler; import org.apache.brooklyn.rest.util.WebResourceUtils; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.CountdownTimer; -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.guava.Maybe; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; public class ServerResource extends AbstractBrooklynRestResource implements ServerApi { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java index bf83a74..dd7a9f6 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/UsageResource.java @@ -40,10 +40,9 @@ import org.apache.brooklyn.rest.api.UsageApi; import org.apache.brooklyn.rest.domain.UsageStatistic; import org.apache.brooklyn.rest.domain.UsageStatistics; import org.apache.brooklyn.rest.transform.ApplicationTransformer; - -import brooklyn.util.exceptions.UserFacingException; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Time; +import org.apache.brooklyn.util.exceptions.UserFacingException; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Time; import com.google.common.base.Objects; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/AbstractSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/AbstractSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/AbstractSecurityProvider.java index bbdece8..91c2523 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/AbstractSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/AbstractSecurityProvider.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.rest.security.provider; import javax.servlet.http.HttpSession; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; /** * Provides default implementations of {@link #isAuthenticated(HttpSession)} and http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java index ce299ab..af1ee0a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/BrooklynUserWithRandomPasswordSecurityProvider.java @@ -24,9 +24,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; - -import brooklyn.util.net.Networking; -import brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.Identifiers; public class BrooklynUserWithRandomPasswordSecurityProvider extends AbstractSecurityProvider implements SecurityProvider {
