Repository: brooklyn-server Updated Branches: refs/heads/master 5ea1b1b9d -> 864380690
Organize imports Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/33292de3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/33292de3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/33292de3 Branch: refs/heads/master Commit: 33292de3a9a09fc6a4805af04e875f3c89f8fe49 Parents: 9048959 Author: Andrew Donald Kennedy <[email protected]> Authored: Wed Feb 1 21:13:32 2017 +0000 Committer: Andrew Donald Kennedy <[email protected]> Committed: Fri May 19 14:01:20 2017 +0100 ---------------------------------------------------------------------- .../amp/containerservice/kubernetes/entity/KubernetesPod.java | 1 - .../kubernetes/location/KubernetesLocationConfig.java | 4 +--- .../location/machine/KubernetesSshMachineLocation.java | 1 + .../containerservice/kubernetes/location/ImageChooserTest.java | 2 -- .../kubernetes/location/KubernetesLocationLiveTest.java | 3 --- .../kubernetes/location/KubernetesLocationResolverTest.java | 2 -- .../openshift/location/OpenShiftLocationLiveTest.java | 1 - .../openshift/location/OpenShiftLocationResolverTest.java | 2 -- 8 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/entity/KubernetesPod.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/entity/KubernetesPod.java b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/entity/KubernetesPod.java index 9467241..bf5444d 100644 --- a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/entity/KubernetesPod.java +++ b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/entity/KubernetesPod.java @@ -12,7 +12,6 @@ import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.math.MathPredicates; -import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationConfig.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationConfig.java b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationConfig.java index c293413..0571fc2 100644 --- a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationConfig.java +++ b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationConfig.java @@ -5,10 +5,8 @@ import java.util.Map; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.LocationConfigKeys; -import org.apache.brooklyn.core.sensor.Sensors; -import org.apache.brooklyn.util.core.flags.SetFromFlag; -import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/machine/KubernetesSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/machine/KubernetesSshMachineLocation.java b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/machine/KubernetesSshMachineLocation.java index f05fc45..ad83f8f 100644 --- a/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/machine/KubernetesSshMachineLocation.java +++ b/kubernetes-location/src/main/java/io/cloudsoft/amp/containerservice/kubernetes/location/machine/KubernetesSshMachineLocation.java @@ -1,5 +1,6 @@ package io.cloudsoft.amp.containerservice.kubernetes.location.machine; +import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/ImageChooserTest.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/ImageChooserTest.java b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/ImageChooserTest.java index e66631b..8f28929 100644 --- a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/ImageChooserTest.java +++ b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/ImageChooserTest.java @@ -6,8 +6,6 @@ import static org.testng.Assert.assertFalse; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.cloudsoft.amp.containerservice.kubernetes.location.ImageChooser; - public class ImageChooserTest { private ImageChooser chooser; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationLiveTest.java b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationLiveTest.java index 45e6bbc..52be446 100644 --- a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationLiveTest.java +++ b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationLiveTest.java @@ -29,9 +29,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.net.HostAndPort; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocation; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationConfig; - /** /** * Live tests for deploying simple containers. Particularly useful during dev, but not so useful http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationResolverTest.java b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationResolverTest.java index acf7924..acd366b 100644 --- a/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationResolverTest.java +++ b/kubernetes-location/src/test/java/io/cloudsoft/amp/containerservice/kubernetes/location/KubernetesLocationResolverTest.java @@ -13,8 +13,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocation; - public class KubernetesLocationResolverTest extends BrooklynMgmtUnitTestSupport { private static final Logger LOG = LoggerFactory.getLogger(KubernetesLocationResolverTest.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationLiveTest.java b/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationLiveTest.java index 212dd91..cbb7d53 100644 --- a/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationLiveTest.java +++ b/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationLiveTest.java @@ -8,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationLiveTest; -import io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocation; /** * Tests deploying containers via the {@code openshift"} location, to an OpenShift endpoint. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/33292de3/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationResolverTest.java b/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationResolverTest.java index 1cd6ffc..7d06460 100644 --- a/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationResolverTest.java +++ b/openshift-location/src/test/java/io/cloudsoft/amp/containerservice/openshift/location/OpenShiftLocationResolverTest.java @@ -13,8 +13,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocation; - public class OpenShiftLocationResolverTest extends BrooklynMgmtUnitTestSupport { private static final Logger LOG = LoggerFactory.getLogger(OpenShiftLocationResolverTest.class);
