From 29952405dcb09591a4bf0dae084de29c4db1ad98 Mon Sep 17 00:00:00 2001 From: Marco Ziccardi Date: Tue, 19 Apr 2016 13:30:17 +0200 Subject: [PATCH] Fix minor style errros --- .../src/main/java/com/google/cloud/BatchResult.java | 2 +- .../src/main/java/com/google/cloud/dns/DnsBatch.java | 2 +- .../src/main/java/com/google/cloud/dns/DnsImpl.java | 3 +-- .../main/java/com/google/cloud/dns/spi/DefaultDnsRpc.java | 2 +- .../test/java/com/google/cloud/dns/DnsBatchResultTest.java | 1 - .../src/test/java/com/google/cloud/dns/DnsBatchTest.java | 2 +- .../com/google/cloud/dns/testing/LocalDnsHelperTest.java | 7 +++---- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gcloud-java-core/src/main/java/com/google/cloud/BatchResult.java b/gcloud-java-core/src/main/java/com/google/cloud/BatchResult.java index 3d5b06fd1db6..fb78409ea31e 100644 --- a/gcloud-java-core/src/main/java/com/google/cloud/BatchResult.java +++ b/gcloud-java-core/src/main/java/com/google/cloud/BatchResult.java @@ -34,7 +34,7 @@ public abstract class BatchResult { private T result; private boolean completed = false; private E error; - private List> toBeNotified = new LinkedList<>(); + private final List> toBeNotified = new LinkedList<>(); /** * Returns {@code true} if the batch has been completed and the result is available; {@code false} diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsBatch.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsBatch.java index 8e6c98d36c7a..d81fc27f3a1a 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsBatch.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsBatch.java @@ -42,7 +42,7 @@ */ public class DnsBatch { - private RpcBatch batch; + private final RpcBatch batch; private final DnsRpc dnsRpc; private final DnsOptions options; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java index 7f657cb912f1..be0e8621cf41 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java @@ -113,8 +113,7 @@ public Page nextPage() { static Function zoneFromPb(final DnsOptions options) { return new Function() { @Override - public Zone apply( - com.google.api.services.dns.model.ManagedZone zonePb) { + public Zone apply(ManagedZone zonePb) { return Zone.fromPb(options.service(), zonePb); } }; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DefaultDnsRpc.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DefaultDnsRpc.java index 518aa749733c..4ee117cc7ea1 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DefaultDnsRpc.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DefaultDnsRpc.java @@ -58,7 +58,7 @@ public class DefaultDnsRpc implements DnsRpc { private class DefaultRpcBatch implements RpcBatch { - private BatchRequest batch; + private final BatchRequest batch; private DefaultRpcBatch(BatchRequest batch) { this.batch = batch; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java index c2b1c10b4741..96ca99cc9e3e 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.cloud.BaseServiceException; import com.google.cloud.BatchResult; import org.easymock.EasyMock; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java index 3f6605ff2d76..bd743a3babb6 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java @@ -101,7 +101,7 @@ public class DnsBatchTest { private DnsRpc dnsRpcMock; private RpcBatch batchMock; private DnsBatch dnsBatch; - private Dns dns = EasyMock.createStrictMock(Dns.class); + private final Dns dns = EasyMock.createStrictMock(Dns.class); @Before public void setUp() { diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java index 6ac28df7c132..6831485f821e 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java @@ -2378,12 +2378,11 @@ public void onSuccess(ChangesListResponse response) { }, ImmutableMap.of(DnsRpc.Option.PAGE_SIZE, 2)); final Iterable descending = RPC.listChangeRequests(ZONE1.getName(), ImmutableMap.of(DnsRpc.Option.SORTING_ORDER, "descending")).results(); - final int size = 4; batch.addListChangeRequests(ZONE_NAME1, new SuccessExpectedCallback() { @Override public void onSuccess(ChangesListResponse response) { List changes = response.getChanges(); - for (int i = 0; i < size; i++) { + for (int i = 0; i < 4; i++) { assertEquals(Iterables.get(descending, i), changes.get(i)); } } @@ -2392,8 +2391,8 @@ public void onSuccess(ChangesListResponse response) { @Override public void onSuccess(ChangesListResponse response) { List changes = response.getChanges(); - for (int i = 0; i < size; i++) { - assertEquals(Iterables.get(descending, i), changes.get(size - i - 1)); + for (int i = 0; i < 4; i++) { + assertEquals(Iterables.get(descending, i), changes.get(3 - i)); } } }, ImmutableMap.of(DnsRpc.Option.SORTING_ORDER, "ascending"));