You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/12/22 08:12:11 UTC
jclouds-labs git commit: Fix Guava imports and remove the unnecessary
injectMocks
Repository: jclouds-labs
Updated Branches:
refs/heads/2.0.x 0351481d9 -> 199e77893
Fix Guava imports and remove the unnecessary injectMocks
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/199e7789
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/199e7789
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/199e7789
Branch: refs/heads/2.0.x
Commit: 199e77893ba26d569e52f2e5c2f62887dc0790cf
Parents: 0351481
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri Dec 22 09:12:02 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Dec 22 09:12:02 2017 +0100
----------------------------------------------------------------------
.../strategy/GetOrCreateNetworkDomainThenCreateNodes.java | 2 +-
.../strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/199e7789/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodes.java
----------------------------------------------------------------------
diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodes.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodes.java
index a427ed4..5896b9b 100644
--- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodes.java
+++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodes.java
@@ -42,7 +42,7 @@ import javax.inject.Singleton;
import java.util.Map;
import java.util.Set;
-import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Objects.firstNonNull;
import static java.lang.String.format;
import static org.jclouds.dimensiondata.cloudcontrol.compute.options.DimensionDataCloudControlTemplateOptions.DEFAULT_NETWORK_DOMAIN_NAME;
import static org.jclouds.dimensiondata.cloudcontrol.compute.options.DimensionDataCloudControlTemplateOptions.DEFAULT_VLAN_NAME;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/199e7789/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java
----------------------------------------------------------------------
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java
index 0fef94d..dcef476 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/compute/strategy/GetOrCreateNetworkDomainThenCreateNodesTest.java
@@ -49,7 +49,6 @@ import java.util.Date;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMockSupport.injectMocks;
import static org.jclouds.dimensiondata.cloudcontrol.compute.options.DimensionDataCloudControlTemplateOptions.DEFAULT_NETWORK_DOMAIN_NAME;
import static org.jclouds.dimensiondata.cloudcontrol.compute.options.DimensionDataCloudControlTemplateOptions.DEFAULT_PRIVATE_IPV4_BASE_ADDRESS;
import static org.jclouds.dimensiondata.cloudcontrol.compute.options.DimensionDataCloudControlTemplateOptions.DEFAULT_PRIVATE_IPV4_PREFIX_SIZE;
@@ -112,9 +111,6 @@ public class GetOrCreateNetworkDomainThenCreateNodesTest {
.ipv6GatewayAddress("2607:f480:111:1575:0:0:0:1").createTime(new Date()).state(State.NORMAL)
.datacenterId("NA9").build();
- injectMocks(api);
- injectMocks(template);
- injectMocks(networkApi);
expect(template.getOptions()).andReturn(templateOptions).anyTimes();
expect(template.getLocation()).andReturn(location);
expect(location.getId()).andReturn(datacenterId);