Repository: jclouds-labs-google Updated Branches: refs/heads/master 9f60939e8 -> a9ea2adfd
Cleanup ListPage in google apis. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/bb9934cf Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/bb9934cf Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/bb9934cf Branch: refs/heads/master Commit: bb9934cfab2aecac09e38c28e163d2d8864ee0e7 Parents: 9f60939 Author: Adrian Cole <[email protected]> Authored: Mon Nov 3 20:08:36 2014 -0800 Committer: Adrian Cole <[email protected]> Committed: Tue Nov 4 08:25:03 2014 -0800 ---------------------------------------------------------------------- .../googlecloudstorage/domain/ListPage.java | 15 +++++++-------- .../GoogleComputeEngineFallbacks.java | 2 +- .../googlecomputeengine/domain/ListPage.java | 18 +++++------------- .../features/HttpHealthCheckApiLiveTest.java | 4 +++- .../features/RegionOperationApiExpectTest.java | 3 +-- .../features/TargetPoolApiLiveTest.java | 4 ++-- .../features/ZoneOperationApiExpectTest.java | 3 +-- .../parse/ParseAddressListTest.java | 3 +-- .../parse/ParseDiskListTest.java | 3 +-- .../parse/ParseDiskTypeListTest.java | 3 +-- .../parse/ParseFirewallListTest.java | 3 +-- .../parse/ParseForwardingRuleListTest.java | 3 +-- .../parse/ParseGlobalOperationListTest.java | 3 +-- .../parse/ParseHttpHealthCheckListTest.java | 3 +-- .../parse/ParseImageListTest.java | 3 +-- .../parse/ParseInstanceListTest.java | 3 +-- .../parse/ParseMachineTypeListTest.java | 3 +-- .../parse/ParseNetworkListTest.java | 3 +-- .../parse/ParseRegionListTest.java | 3 +-- .../parse/ParseRouteListTest.java | 3 +-- .../parse/ParseSnapshotListTest.java | 3 +-- .../parse/ParseTargetPoolListTest.java | 3 +-- .../parse/ParseZoneListTest.java | 3 +-- 23 files changed, 36 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java index efa017c..f94b1ca 100644 --- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java +++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java @@ -16,32 +16,31 @@ */ package org.jclouds.googlecloudstorage.domain; +import static org.jclouds.googlecloudstorage.internal.NullSafeCopies.copyOf; + import java.beans.ConstructorProperties; import java.util.List; import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ForwardingList; -import com.google.common.collect.ImmutableList; -/** - * The collection returned from any <code>listFirstPage()</code> method. - */ +/** An immutable list that includes a token, if there is another page available. */ public final class ListPage<T> extends ForwardingList<T> { private final List<T> items; private final String nextPageToken; private final List<String> prefixes; - public static <T> ListPage<T> create(Iterable<T> items, String nextPageToken, List<String> prefixes) { + public static <T> ListPage<T> create(List<T> items, String nextPageToken, List<String> prefixes) { return new ListPage<T>(items, nextPageToken, prefixes); } @ConstructorProperties({ "items", "nextPageToken", "prefixes" }) - ListPage(Iterable<T> items, String nextPageToken, List<String> prefixes) { - this.items = items != null ? ImmutableList.copyOf(items) : ImmutableList.<T>of(); + ListPage(List<T> items, String nextPageToken, List<String> prefixes) { + this.items = copyOf(items); this.nextPageToken = nextPageToken; - this.prefixes = prefixes != null ? prefixes : ImmutableList.<String>of(); + this.prefixes = copyOf(prefixes); } @Nullable public String nextPageToken() { http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java index 573bca0..4cdbad1 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java @@ -37,7 +37,7 @@ public final class GoogleComputeEngineFallbacks { } public static final class EmptyListPageOnNotFoundOr404 implements Fallback<Object> { @Override public ListPage<Object> createOrPropagate(Throwable t) throws Exception { - return valOnNotFoundOr404(ListPage.create(null, null, null), t); + return valOnNotFoundOr404(ListPage.create(null, null), t); } } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java index 0205df1..8d66104 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java @@ -25,34 +25,26 @@ import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ForwardingList; -/** - * The collection returned from any <code>listFirstPage()</code> method. - */ +/** An immutable list that includes a token, if there is another page available. */ public final class ListPage<T> extends ForwardingList<T> { private final List<T> items; private final String nextPageToken; - private final List<String> prefixes; - public static <T> ListPage<T> create(List<T> items, String nextPageToken, List<String> prefixes) { - return new ListPage<T>(items, nextPageToken, prefixes); + public static <T> ListPage<T> create(List<T> items, String nextPageToken) { + return new ListPage<T>(items, nextPageToken); } - @ConstructorProperties({ "items", "nextPageToken", "prefixes" }) - ListPage(List<T> items, String nextPageToken, List<String> prefixes) { + @ConstructorProperties({ "items", "nextPageToken" }) + ListPage(List<T> items, String nextPageToken) { this.items = copyOf(items); this.nextPageToken = nextPageToken; - this.prefixes = copyOf(prefixes); } @Nullable public String nextPageToken() { return nextPageToken; } - public List<String> prefixes() { - return prefixes; - } - @Override protected List<T> delegate() { return items; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java index 139e610..bebe700 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java @@ -27,6 +27,8 @@ import org.jclouds.googlecomputeengine.options.HttpHealthCheckCreationOptions; import org.jclouds.googlecomputeengine.options.ListOptions; import org.testng.annotations.Test; +import com.google.common.collect.Iterables; + public class HttpHealthCheckApiLiveTest extends BaseGoogleComputeEngineApiLiveTest { private static final String HTTP_HEALTH_CHECK_NAME = "http-health-check-api-live-test"; @@ -69,7 +71,7 @@ public class HttpHealthCheckApiLiveTest extends BaseGoogleComputeEngineApiLiveTe public void testListHttpHealthCheck() { ListPage<HttpHealthCheck> httpHealthCheck = api().list(new ListOptions.Builder() .filter("name eq " + HTTP_HEALTH_CHECK_NAME)); - assertEquals(httpHealthCheck.size(), 1); + assertEquals(Iterables.size(httpHealthCheck), 1); } @Test(groups = "live", dependsOnMethods = "testGetHttpHealthCheck") http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java index 83ef30a..0e1a2f8 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java @@ -53,8 +53,7 @@ public class RegionOperationApiExpectTest extends BaseGoogleComputeEngineApiExpe private ListPage<Operation> expectedList() { return ListPage.create( // ImmutableList.of(new ParseRegionOperationTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java index 52f2e82..124d062 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java @@ -40,6 +40,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.Test; import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; public class TargetPoolApiLiveTest extends BaseGoogleComputeEngineApiLiveTest { @@ -205,10 +206,9 @@ public class TargetPoolApiLiveTest extends BaseGoogleComputeEngineApiLiveTest { @Test(groups = "live", dependsOnMethods = "testInsertTargetPool") public void testListTargetPool() { - ListPage<TargetPool> targetPool = api().list(new ListOptions.Builder() .filter("name eq " + BACKUP_TARGETPOOL_NAME)); - assertEquals(targetPool.size(), 1); + assertEquals(Iterables.size(targetPool), 1); } @Test(groups = "live", dependsOnMethods = {"testInsertTargetPool2"}) http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java index 7608a71..4be46c3 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java @@ -100,8 +100,7 @@ public class ZoneOperationApiExpectTest extends BaseGoogleComputeEngineApiExpect private static ListPage<Operation> expectedList() { return ListPage.create( // ImmutableList.of(new ParseZoneOperationTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java index b71726f..b269d7b 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseAddressListTest.java @@ -52,8 +52,7 @@ public class ParseAddressListTest extends BaseGoogleComputeEngineParseTest<ListP ); return ListPage.create( // ImmutableList.of(address1, address2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java index d2fb69c..6909f23 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java @@ -39,8 +39,7 @@ public class ParseDiskListTest extends BaseGoogleComputeEngineParseTest<ListPage public ListPage<Disk> expected() { return ListPage.create( // ImmutableList.of(new ParseDiskTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java index af03d68..e7f0488 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTypeListTest.java @@ -52,8 +52,7 @@ public class ParseDiskTypeListTest extends BaseGoogleComputeEngineParseTest<List DiskType diskType2 = new ParseDiskTypeTest().expected(); return ListPage.create( // ImmutableList.of(diskType1, diskType2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java index e897e10..1b0e13b 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java @@ -53,8 +53,7 @@ public class ParseFirewallListTest extends BaseGoogleComputeEngineParseTest<List ); return ListPage.create( // ImmutableList.of(firewall1, firewall2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java index f3dcd74..551c06e 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseForwardingRuleListTest.java @@ -39,8 +39,7 @@ public class ParseForwardingRuleListTest extends BaseGoogleComputeEngineParseTes public ListPage<ForwardingRule> expected() { return ListPage.create( // ImmutableList.of(new ParseForwardingRuleTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java index 1536545..3ebd1a3 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseGlobalOperationListTest.java @@ -39,8 +39,7 @@ public class ParseGlobalOperationListTest extends BaseGoogleComputeEngineParseTe public ListPage<Operation> expected() { return ListPage.create( // ImmutableList.of(new ParseGlobalOperationTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java index bb5cc39..3cd4722 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseHttpHealthCheckListTest.java @@ -70,8 +70,7 @@ public class ParseHttpHealthCheckListTest extends BaseGoogleComputeEngineParseTe ); return ListPage.create( // ImmutableList.of(healthCheck1, healthCheck2, healthCheck3), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java index 9c40040..dadc1f0 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageListTest.java @@ -38,8 +38,7 @@ public class ParseImageListTest extends BaseGoogleComputeEngineParseTest<ListPag public ListPage<Image> expected() { return ListPage.create( // ImmutableList.of(new ParseImageTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java index 2cc4697..49ebe26 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceListTest.java @@ -39,8 +39,7 @@ public class ParseInstanceListTest extends BaseGoogleComputeEngineParseTest<List public ListPage<Instance> expected() { return ListPage.create( // ImmutableList.of(new ParseInstanceTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java index 74d7fde..25ed1f2 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeListTest.java @@ -80,8 +80,7 @@ public class ParseMachineTypeListTest extends BaseGoogleComputeEngineParseTest<L ); return ListPage.create( // ImmutableList.of(machineType1, machineType2, machineType3), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java index 78b0f5e..2f0bd11 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkListTest.java @@ -39,8 +39,7 @@ public class ParseNetworkListTest extends BaseGoogleComputeEngineParseTest<ListP public ListPage<Network> expected() { return ListPage.create( // ImmutableList.of(new ParseNetworkTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java index b5e0bff..d7c9497 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java @@ -61,8 +61,7 @@ public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPa ); return ListPage.create( // ImmutableList.of(region1, region2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java index 0f0fbb8..cd425a6 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRouteListTest.java @@ -56,8 +56,7 @@ public class ParseRouteListTest extends BaseGoogleComputeEngineParseTest<ListPag ); return ListPage.create( // ImmutableList.of(route1, route2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java index 6ed886b..96d5564 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSnapshotListTest.java @@ -52,8 +52,7 @@ public class ParseSnapshotListTest extends BaseGoogleComputeEngineParseTest<List ); return ListPage.create( // ImmutableList.of(snapshot1, snapshot2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java index 474fbde..d900f90 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseTargetPoolListTest.java @@ -39,8 +39,7 @@ public class ParseTargetPoolListTest extends BaseGoogleComputeEngineParseTest<Li public ListPage<TargetPool> expected() { return ListPage.create( // ImmutableList.of(new ParseTargetPoolTest().expected()), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/bb9934cf/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java index 90902c8..5fd45d3 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseZoneListTest.java @@ -57,8 +57,7 @@ public class ParseZoneListTest extends BaseGoogleComputeEngineParseTest<ListPage ); return ListPage.create( // ImmutableList.of(zone1, zone2), // items - null, // nextPageToken - null // prefixes + null // nextPageToken ); } }
