Trivial tidies.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0f9d538b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0f9d538b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0f9d538b Branch: refs/heads/master Commit: 0f9d538ba398c5352f69e6f5ef2cce32fba87110 Parents: 2e08895 Author: Alasdair Hodge <git...@alasdairhodge.co.uk> Authored: Thu Dec 7 18:51:17 2017 +0000 Committer: Alasdair Hodge <git...@alasdairhodge.co.uk> Committed: Mon Dec 11 14:34:50 2017 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/location/ssh/SshMachineLocation.java | 7 ++----- .../brooklyn/location/jclouds/JcloudsSshMachineLocation.java | 8 -------- 2 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0f9d538b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java index d2b7d10..fc1fadc 100644 --- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java @@ -83,7 +83,6 @@ import org.apache.brooklyn.util.core.mutex.WithMutexes; import org.apache.brooklyn.util.core.task.ScheduledTask; import org.apache.brooklyn.util.core.task.Tasks; import org.apache.brooklyn.util.core.task.system.internal.ExecWithLoggingHelpers; -import org.apache.brooklyn.util.core.task.system.internal.ExecWithLoggingHelpers.ExecRunner; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; import org.apache.brooklyn.util.guava.KeyTransformingLoadingCache.KeyTransformingSameTypeLoadingCache; @@ -120,8 +119,6 @@ import com.google.common.collect.Sets; import com.google.common.net.HostAndPort; import com.google.common.reflect.TypeToken; -import groovy.lang.Closure; - /** * Operations on a machine that is accessible via ssh. * <p> @@ -269,7 +266,7 @@ public class SshMachineLocation extends AbstractMachineLocation implements Machi this(MutableMap.of()); } - public SshMachineLocation(Map properties) { + public SshMachineLocation(Map<?,?> properties) { super(properties); usedPorts = (usedPorts != null) ? Sets.newLinkedHashSet(usedPorts) : Sets.<Integer>newLinkedHashSet(); } @@ -574,7 +571,7 @@ public class SshMachineLocation extends AbstractMachineLocation implements Machi } protected boolean previouslyConnected = false; - protected SshTool connectSsh(Map props) { + protected SshTool connectSsh(Map<?,?> props) { try { if (!groovyTruth(user)) { String newUser = getUser(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0f9d538b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java index c40959d..905864f 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java @@ -24,7 +24,6 @@ import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -45,9 +44,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.net.Networking; import org.apache.brooklyn.util.text.Strings; import org.jclouds.compute.ComputeService; -import org.jclouds.compute.ComputeServiceContext; -import org.jclouds.compute.callables.RunScriptOnNode; -import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; @@ -55,10 +51,7 @@ import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.Processor; import org.jclouds.compute.domain.Template; -import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.domain.LoginCredentials; -import org.jclouds.scriptbuilder.domain.InterpretableStatement; -import org.jclouds.scriptbuilder.domain.Statement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +63,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.net.HostAndPort; -import com.google.common.util.concurrent.ListenableFuture; public class JcloudsSshMachineLocation extends SshMachineLocation implements JcloudsMachineLocation {
