http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/BasicExecutionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/core/util/task/BasicExecutionManager.java index f93abe1..5658290 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/BasicExecutionManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/BasicExecutionManager.java @@ -50,13 +50,12 @@ import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableList; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Identifiers; - import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CaseFormat;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/BasicTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/BasicTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/BasicTask.java index c776e4d..27ba9d0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/BasicTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/BasicTask.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.core.util.task; -import static brooklyn.util.JavaGroovyEquivalents.asString; -import static brooklyn.util.JavaGroovyEquivalents.elvisString; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.asString; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvisString; import groovy.lang.Closure; import java.io.PrintWriter; @@ -44,16 +44,16 @@ import java.util.concurrent.TimeoutException; import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.GroovyJavaMethods; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.annotations.Beta; import com.google.common.base.Function; @@ -665,7 +665,7 @@ public class BasicTask<T> implements TaskInternal<T> { } if (verbosity>=2) { StackTraceElement[] st = ti.getStackTrace(); - st = brooklyn.util.javalang.StackTraceSimplifier.cleanStackTrace(st); + st = org.apache.brooklyn.util.javalang.StackTraceSimplifier.cleanStackTrace(st); if (st!=null && st.length>0) rv += "\n" +"At: "+st[0]; for (int ii=1; ii<st.length; ii++) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/CompoundTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/CompoundTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/CompoundTask.java index 8fdb146..3a71ee5 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/CompoundTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/CompoundTask.java @@ -32,11 +32,11 @@ import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.util.collections.MutableMap; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicSequentialTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicSequentialTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicSequentialTask.java index e197705..26f6b66 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicSequentialTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicSequentialTask.java @@ -32,14 +32,14 @@ import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskQueueingContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicTasks.java b/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicTasks.java index ed46558..8264eb6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicTasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/DynamicTasks.java @@ -28,12 +28,12 @@ import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.api.management.TaskQueueingContext; import org.apache.brooklyn.api.management.TaskWrapper; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.exceptions.Exceptions; -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/core/src/main/java/org/apache/brooklyn/core/util/task/ForwardingTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ForwardingTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ForwardingTask.java index 794dea9..87f21f0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ForwardingTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ForwardingTask.java @@ -27,8 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.brooklyn.api.management.Task; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.collect.ForwardingObject; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ParallelTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ParallelTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ParallelTask.java index 10da414..b9418c0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ParallelTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ParallelTask.java @@ -24,9 +24,8 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.management.Task; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ScheduledTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ScheduledTask.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ScheduledTask.java index 5c4b208..85818be 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ScheduledTask.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ScheduledTask.java @@ -29,9 +29,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.management.Task; - -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.annotations.Beta; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/TaskBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/TaskBuilder.java b/core/src/main/java/org/apache/brooklyn/core/util/task/TaskBuilder.java index b105a00..05ba759 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/TaskBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/TaskBuilder.java @@ -28,11 +28,10 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.api.management.TaskQueueingContext; - -import brooklyn.util.JavaGroovyEquivalents; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.JavaGroovyEquivalents; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/TaskInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/TaskInternal.java b/core/src/main/java/org/apache/brooklyn/core/util/task/TaskInternal.java index b4a6569..fde3834 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/TaskInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/TaskInternal.java @@ -25,8 +25,7 @@ import java.util.concurrent.Future; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.api.management.Task; - -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/Tasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/Tasks.java b/core/src/main/java/org/apache/brooklyn/core/util/task/Tasks.java index d391a90..030acbc 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/Tasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/Tasks.java @@ -33,16 +33,15 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.api.management.TaskQueueingContext; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.annotations.Beta; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ValueResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ValueResolver.java index 7fc112b..2e4b46e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ValueResolver.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ValueResolver.java @@ -30,18 +30,18 @@ import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Durations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.EntityInternal; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Durations; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshFetchTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshFetchTaskWrapper.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshFetchTaskWrapper.java index b6c2931..93a5aa4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshFetchTaskWrapper.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshFetchTaskWrapper.java @@ -31,9 +31,8 @@ import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshPutTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshPutTaskFactory.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshPutTaskFactory.java index 05cc42e..d50902c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshPutTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshPutTaskFactory.java @@ -24,10 +24,9 @@ import java.io.Reader; import org.apache.brooklyn.api.management.TaskFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.stream.ReaderInputStream; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.stream.ReaderInputStream; import com.google.common.base.Suppliers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshTasks.java b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshTasks.java index 5f8d735..04d6cf3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshTasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/ssh/SshTasks.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.api.management.TaskQueueingContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.SshTool; @@ -40,7 +41,6 @@ import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.config.ConfigUtils; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; @@ -48,12 +48,11 @@ import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.net.Urls; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskFactory.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskFactory.java index f66e1ea..29c400b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskFactory.java @@ -21,11 +21,9 @@ package org.apache.brooklyn.core.util.task.system; import java.util.Map; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.task.system.ProcessTaskStub.ScriptReturnType; - -import brooklyn.config.ConfigKey; - import org.apache.brooklyn.location.basic.SshMachineLocation; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskStub.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskStub.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskStub.java index 1937d15..c352162 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskStub.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskStub.java @@ -24,9 +24,8 @@ import java.util.Map; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskWrapper.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskWrapper.java index 045b3c9..43a49e8 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskWrapper.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/ProcessTaskWrapper.java @@ -28,12 +28,12 @@ import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.system.internal.AbstractProcessTaskFactory; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.BrooklynTaskTags; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/AbstractProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/AbstractProcessTaskFactory.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/AbstractProcessTaskFactory.java index 8b90263..cc41373 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/AbstractProcessTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/AbstractProcessTaskFactory.java @@ -24,17 +24,16 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynTaskTags; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; import org.apache.brooklyn.core.util.task.system.ProcessTaskStub; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/ExecWithLoggingHelpers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/ExecWithLoggingHelpers.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/ExecWithLoggingHelpers.java index 9e96674..092ec06 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/ExecWithLoggingHelpers.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/ExecWithLoggingHelpers.java @@ -26,20 +26,17 @@ import java.util.List; import java.util.Map; import org.slf4j.Logger; - -import brooklyn.config.ConfigKey; - +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.core.util.internal.ssh.ShellAbstractTool; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.stream.StreamGobbler; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/SystemProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/SystemProcessTaskFactory.java b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/SystemProcessTaskFactory.java index 4a6dacb..fed98a3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/SystemProcessTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/task/system/internal/SystemProcessTaskFactory.java @@ -27,8 +27,7 @@ import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/text/DataUriSchemeParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/text/DataUriSchemeParser.java b/core/src/main/java/org/apache/brooklyn/core/util/text/DataUriSchemeParser.java index d4ed26c..86b5b7a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/text/DataUriSchemeParser.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/text/DataUriSchemeParser.java @@ -26,7 +26,7 @@ import java.nio.charset.Charset; import java.util.LinkedHashMap; import java.util.Map; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/text/TemplateProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/text/TemplateProcessor.java b/core/src/main/java/org/apache/brooklyn/core/util/text/TemplateProcessor.java index 6fb3c15..39bf17d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/text/TemplateProcessor.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/text/TemplateProcessor.java @@ -31,6 +31,9 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,9 +42,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; import com.google.common.base.Charsets; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverter.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverter.java index 7d95568..0a7bd04 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverter.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverter.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.core.util.xstream; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.enums.EnumConverter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/Inet4AddressConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/Inet4AddressConverter.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/Inet4AddressConverter.java index 53133c1..979aef3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/Inet4AddressConverter.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/Inet4AddressConverter.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.core.util.xstream; import java.net.Inet4Address; import java.net.UnknownHostException; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/MutableSetConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/MutableSetConverter.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/MutableSetConverter.java index 4b7bcbc..28bfd2e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/MutableSetConverter.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/MutableSetConverter.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.core.util.xstream; -import brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.MutableSet; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.mapper.Mapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverter.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverter.java index 86a4cd0..cd67da5 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverter.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverter.java @@ -22,13 +22,12 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Identifiers; - import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.ExtendedHierarchicalStreamWriterHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlSerializer.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlSerializer.java index 3b3b582..61e7fe7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlSerializer.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlSerializer.java @@ -27,9 +27,9 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; import com.google.common.collect.ImmutableList; import com.thoughtworks.xstream.XStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java index 637f078..dfcf4b9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java @@ -28,11 +28,10 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.w3c.dom.Document; import org.xml.sax.SAXException; -import brooklyn.util.exceptions.Exceptions; - public class XmlUtil { public static Object xpath(String xml, String xpath) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java index 3f84862..ec6267c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java @@ -23,6 +23,7 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Entity; 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.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ssh.SshTasks; @@ -30,21 +31,19 @@ import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.Attributes; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.location.basic.Machines; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.basic.SupportsPortForwarding; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.text.Strings; import org.python.google.common.base.Predicates; import org.python.google.common.collect.Iterables; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Cidr; -import brooklyn.util.text.Strings; - import com.google.common.base.Supplier; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java index 935dff3..9265276 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManager.java @@ -18,10 +18,10 @@ */ package org.apache.brooklyn.location.access; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import com.google.common.annotations.Beta; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java index 5e2d3ca..f9a9c32 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerClient.java @@ -24,10 +24,9 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; -import brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; +import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java index f1705c8..910ee93 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java @@ -34,12 +34,12 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mementos.LocationMemento; import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.rebind.BasicLocationRebindSupport; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java index b90e961..9e785c6 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java @@ -19,9 +19,9 @@ package org.apache.brooklyn.location.basic; import static brooklyn.util.GroovyJavaMethods.elvis; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.io.Closeable; import java.util.Collection; @@ -35,6 +35,9 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.internal.storage.Reference; @@ -48,19 +51,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.basic.AbstractBrooklynObject; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.BasicLocationRebindSupport; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.location.geo.HasHostGeoInfo; import org.apache.brooklyn.location.geo.HostGeoInfo; - -import brooklyn.util.collections.SetFromLiveMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.collections.SetFromLiveMap; +import org.apache.brooklyn.util.guava.Maybe; +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/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java index aea65ae..b813283 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java @@ -35,9 +35,8 @@ import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.KeyValueParser; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.KeyValueParser; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java index ae1a534..2614f29 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java @@ -30,8 +30,7 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.util.flags.SetFromFlag; - -import brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.stream.Streams; import com.google.common.base.Objects; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java index 9072074..cae2986 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationDefinition.java @@ -21,8 +21,7 @@ package org.apache.brooklyn.location.basic; import java.util.Map; import org.apache.brooklyn.api.location.LocationDefinition; - -import brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Identifiers; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java index 4f8637e..29142e1 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java @@ -40,22 +40,22 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigMap; import org.apache.brooklyn.core.catalog.CatalogPredicates; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.util.config.ConfigBag; +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.guava.Maybe.Absent; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.WildcardGlobs; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; +import org.apache.brooklyn.util.text.WildcardGlobs.PhraseTreatment; -import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.config.ConfigUtils; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.guava.Maybe.Absent; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; -import brooklyn.util.text.WildcardGlobs; -import brooklyn.util.text.WildcardGlobs.PhraseTreatment; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Suppliers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java index 9404af2..c21b748 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java @@ -37,11 +37,10 @@ import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskTags; import org.apache.brooklyn.core.util.task.ssh.internal.PlainSshExecTaskFactory; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; +import org.apache.brooklyn.util.stream.Streams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.stream.Streams; - import com.google.common.base.CharMatcher; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java index c5680ba..7a0ec98 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java @@ -28,9 +28,14 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.UserAndHostAndPort; +import org.apache.brooklyn.util.text.WildcardGlobs; +import org.apache.brooklyn.util.text.WildcardGlobs.PhraseTreatment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,13 +45,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.net.HostAndPort; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Sanitizer; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.UserAndHostAndPort; -import brooklyn.util.text.WildcardGlobs; -import brooklyn.util.text.WildcardGlobs.PhraseTreatment; /** * Examples of valid specs: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/DeprecatedKeysMappingBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/DeprecatedKeysMappingBuilder.java b/core/src/main/java/org/apache/brooklyn/location/basic/DeprecatedKeysMappingBuilder.java index 88593d4..a165086 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/DeprecatedKeysMappingBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/DeprecatedKeysMappingBuilder.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.location.basic; import java.util.Map; +import org.apache.brooklyn.config.ConfigKey; import org.slf4j.Logger; -import brooklyn.config.ConfigKey; - import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java index 170867d..d6b21e9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.LocationManager; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; @@ -50,17 +51,15 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.WildcardGlobs; -import brooklyn.util.text.WildcardGlobs.PhraseTreatment; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.WildcardGlobs; +import org.apache.brooklyn.util.text.WildcardGlobs.PhraseTreatment; /** * A provisioner of {@link MachineLocation}s which takes a list of machines it can connect to. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java index d1eb838..1d38db9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java @@ -25,11 +25,10 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.guava.Maybe.Absent; -import brooklyn.util.text.KeyValueParser; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe.Absent; +import org.apache.brooklyn.util.text.KeyValueParser; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java index b87b85e..4d7d91e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java @@ -32,28 +32,28 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.BrooklynNetworkUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; import org.apache.brooklyn.core.util.mutex.MutexSupport; import org.apache.brooklyn.core.util.mutex.WithMutexes; import org.apache.brooklyn.location.geo.HostGeoInfo; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.LocationWithObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigKeys.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigKeys.java index 05e15f9..2252860 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigKeys.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigKeys.java @@ -21,10 +21,11 @@ package org.apache.brooklyn.location.basic; import java.io.File; import java.util.Set; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.util.os.Os; + import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.os.Os; import com.google.common.base.CaseFormat; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java index 47784b1..c94cff8 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.location.basic; -import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.io.ByteArrayInputStream; import java.io.File; @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; @@ -39,18 +40,16 @@ import org.apache.brooklyn.core.util.crypto.SecureKeys.PassphraseProblem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.crypto.AuthorizedKeysParser; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; -import brooklyn.util.text.StringFunctions; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.crypto.AuthorizedKeysParser; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.StringFunctions; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java index 5d2e18e..8fee176 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java @@ -24,11 +24,11 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; - import org.apache.brooklyn.basic.BrooklynObjectInternal; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; + import brooklyn.entity.basic.ConfigKeys; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java index fc90b38..dc1bc11 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPredicates.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.location.basic; import javax.annotation.Nullable; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import com.google.common.base.Objects; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java index 2655fc9..b52ba34 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java @@ -25,14 +25,14 @@ import java.util.Map; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigUtils; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; import com.google.common.base.Predicates; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/LocationTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationTypeSnapshot.java index 1199ded..de3105c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationTypeSnapshot.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationTypeSnapshot.java @@ -21,9 +21,8 @@ package org.apache.brooklyn.location.basic; import java.util.Map; import org.apache.brooklyn.api.policy.EnricherType; - import org.apache.brooklyn.basic.BrooklynTypeSnapshot; -import brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey; public class LocationTypeSnapshot extends BrooklynTypeSnapshot implements EnricherType { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java b/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java index 9af45a1..e61a825 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/Locations.java @@ -30,13 +30,13 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.LocationManager; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.yaml.Yamls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableList; -import brooklyn.util.guava.Maybe; -import brooklyn.util.yaml.Yamls; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java b/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java index 13f8028..d85f3ee 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/Machines.java @@ -34,9 +34,8 @@ import com.google.common.collect.Iterables; import brooklyn.entity.basic.Attributes; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.HasNetworkAddresses; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.HasNetworkAddresses; /** utilities for working with MachineLocations */ public class Machines { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java index 5740a8f..942cf15 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java @@ -32,17 +32,17 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.CompoundRuntimeException; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.CompoundRuntimeException; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.Strings; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java index 92692ae..b461ab0 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocationResolver.java @@ -31,14 +31,13 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.KeyValueParser; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.KeyValueParser; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; - import com.google.common.collect.Lists; public class MultiLocationResolver implements LocationResolver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java index d57b681..b0c20fe 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java @@ -29,11 +29,10 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.text.Strings; - /** * Allows you to say, in your brooklyn.properties: * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java index 3db980e..451670b 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java @@ -24,10 +24,9 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.util.config.ConfigBag; - -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.guava.Maybe.Absent; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.guava.Maybe.Absent; public class SingleMachineLocationResolver extends AbstractLocationResolver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java index 7c58194..62a83d4 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java @@ -51,6 +51,8 @@ import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.location.PortSupplier; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.crypto.SecureKeys; @@ -92,8 +94,6 @@ import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; import brooklyn.config.BrooklynLogging; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.config.ConfigUtils; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.BrooklynTaskTags; @@ -102,20 +102,20 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.MapConfigKey; import org.apache.brooklyn.location.access.PortForwardManager; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.guava.KeyTransformingLoadingCache.KeyTransformingSameTypeLoadingCache; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.pool.BasicPool; +import org.apache.brooklyn.util.pool.Pool; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.stream.KnownSizeInputStream; +import org.apache.brooklyn.util.stream.ReaderInputStream; +import org.apache.brooklyn.util.stream.StreamGobbler; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.guava.KeyTransformingLoadingCache.KeyTransformingSameTypeLoadingCache; -import brooklyn.util.net.Urls; -import brooklyn.util.pool.BasicPool; -import brooklyn.util.pool.Pool; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.stream.KnownSizeInputStream; -import brooklyn.util.stream.ReaderInputStream; -import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; import groovy.lang.Closure; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/SupportsPortForwarding.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SupportsPortForwarding.java b/core/src/main/java/org/apache/brooklyn/location/basic/SupportsPortForwarding.java index 8c26506..d58e9a5 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SupportsPortForwarding.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SupportsPortForwarding.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.location.basic; -import brooklyn.util.net.Cidr; +import org.apache.brooklyn.util.net.Cidr; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java index 319b9fb..e224449 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/WinRmMachineLocation.java @@ -36,6 +36,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.OsDetails; +import org.apache.brooklyn.config.ConfigKey; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,15 +49,14 @@ import com.google.common.collect.Lists; import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.access.PortForwardManager; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import io.cloudsoft.winrm4j.winrm.WinRmTool; import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java index 4b297f8..c8ec66f 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java @@ -27,8 +27,7 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.location.basic.AbstractLocation; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public abstract class AbstractCloudMachineProvisioningLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, CloudLocationConfig http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java index ad6a11c..1902487 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java @@ -23,11 +23,11 @@ import java.util.Collection; import com.google.common.annotations.Beta; import com.google.common.reflect.TypeToken; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.api.location.MachineLocationCustomizer; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.LocationConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java index 2df845e..a40aea3 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java @@ -22,9 +22,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.trait.HasShortName; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; import com.google.common.annotations.Beta; import com.google.common.base.CharMatcher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java index 26c41ee..d8b7ed1 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java @@ -22,10 +22,9 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.StringShortener; -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.StringShortener; +import org.apache.brooklyn.util.text.Strings; /** * Standard implementation of {@link CloudMachineNamer}, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java index 0bac6c8..50aeb76 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java @@ -21,16 +21,15 @@ package org.apache.brooklyn.location.cloud.names; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.text.TemplateProcessor; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; import org.apache.brooklyn.location.cloud.CloudLocationConfig; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java index 5b6fd05..1ce3190 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java @@ -20,11 +20,11 @@ package org.apache.brooklyn.location.dynamic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.annotations.Beta; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java index 84348cb..8fc365c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java @@ -24,9 +24,9 @@ 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.api.location.LocationDefinition; +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.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/geo/GeoBytesHostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/GeoBytesHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/location/geo/GeoBytesHostGeoLookup.java index 0ff6e8c..35b2620 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/GeoBytesHostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/GeoBytesHostGeoLookup.java @@ -24,11 +24,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.net.Networking; - /** @deprecated Mar 2015 - the API has changed; GetLocation now discouraged for free access, and valuepairs.txt not supported */ @Deprecated public class GeoBytesHostGeoLookup implements HostGeoLookup {
