You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/05/08 01:30:36 UTC
git commit: Address Checkstyle violations
Repository: jclouds
Updated Branches:
refs/heads/master a45124c51 -> 24a7c4d19
Address Checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/24a7c4d1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/24a7c4d1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/24a7c4d1
Branch: refs/heads/master
Commit: 24a7c4d195960d7fcf06064ca5dd9f30b85983f7
Parents: a45124c
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed May 7 15:35:42 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed May 7 16:30:19 2014 -0700
----------------------------------------------------------------------
.../nova/v2_0/predicates/ServerPredicates.java | 1 -
.../nova/v2_0/internal/BaseNovaApiLiveTest.java | 5 ++++-
.../v2_0/predicates/ServerPredicatesMockTest.java | 14 +++++++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/24a7c4d1/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
index 47812eb..18461d2 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
@@ -18,7 +18,6 @@ package org.jclouds.openstack.nova.v2_0.predicates;
import com.google.common.base.Predicate;
import org.jclouds.openstack.nova.v2_0.domain.Server;
-import org.jclouds.openstack.nova.v2_0.domain.ServerCreated;
import org.jclouds.openstack.nova.v2_0.features.ServerApi;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/24a7c4d1/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
index fd8ad6f..996249b 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaApiLiveTest.java
@@ -19,7 +19,10 @@ package org.jclouds.openstack.nova.v2_0.internal;
import java.util.Properties;
import java.util.Set;
-import com.google.common.collect.*;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
import org.jclouds.apis.BaseApiLiveTest;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties;
import org.jclouds.openstack.nova.v2_0.NovaApi;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/24a7c4d1/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicatesMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicatesMockTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicatesMockTest.java
index 4498c7c..33af64a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicatesMockTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicatesMockTest.java
@@ -25,8 +25,12 @@ import org.testng.annotations.Test;
import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.ACTIVE;
import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.SHUTOFF;
-import static org.jclouds.openstack.nova.v2_0.predicates.ServerPredicates.*;
-import static org.testng.Assert.*;
+import static org.jclouds.openstack.nova.v2_0.predicates.ServerPredicates.awaitActive;
+import static org.jclouds.openstack.nova.v2_0.predicates.ServerPredicates.awaitShutoff;
+import static org.jclouds.openstack.nova.v2_0.predicates.ServerPredicates.awaitStatus;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
@Test(groups = "unit", testName = "ServerPredicatesMockTest")
public class ServerPredicatesMockTest extends BaseOpenStackMockTest<NovaApi> {
@@ -41,7 +45,7 @@ public class ServerPredicatesMockTest extends BaseOpenStackMockTest<NovaApi> {
try {
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova");
- ServerApi serverApi = novaApi.getServerApiForZone(("RegionOne"));
+ ServerApi serverApi = novaApi.getServerApiForZone("RegionOne");
boolean result = awaitActive(serverApi).apply("52415800-8b69-11e0-9b19-734f000004d2");
@@ -66,7 +70,7 @@ public class ServerPredicatesMockTest extends BaseOpenStackMockTest<NovaApi> {
try {
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova");
- ServerApi serverApi = novaApi.getServerApiForZone(("RegionOne"));
+ ServerApi serverApi = novaApi.getServerApiForZone("RegionOne");
boolean result = awaitShutoff(serverApi).apply("52415800-8b69-11e0-9b19-734f000004d2");
@@ -88,7 +92,7 @@ public class ServerPredicatesMockTest extends BaseOpenStackMockTest<NovaApi> {
try {
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova");
- ServerApi serverApi = novaApi.getServerApiForZone(("RegionOne"));
+ ServerApi serverApi = novaApi.getServerApiForZone("RegionOne");
boolean result = awaitStatus(serverApi, ACTIVE, 3, 1).apply("52415800-8b69-11e0-9b19-734f000004d2");