Fixed to acommodate checkstyle.

mderka · mderka · commit 1d56acb3d4fe · 2016-01-27T14:09:08.000-08:00
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java
@@ -40,15 +40,15 @@
  */
 public class ChangeRequest implements Serializable {
 
-  static final Function<ResourceRecordSet, DnsRecord> FROM_PB_FUNCTION =
+  private static final Function<ResourceRecordSet, DnsRecord> FROM_PB_FUNCTION =
       new Function<com.google.api.services.dns.model.ResourceRecordSet, DnsRecord>() {
         @Override
         public DnsRecord apply(com.google.api.services.dns.model.ResourceRecordSet pb) {
           return DnsRecord.fromPb(pb);
         }
       };
-  static final Function<DnsRecord, com.google.api.services.dns.model.ResourceRecordSet> TO_PB_FUNCTION =
-      new Function<DnsRecord, com.google.api.services.dns.model.ResourceRecordSet>() {
+  private static final Function<DnsRecord, ResourceRecordSet> TO_PB_FUNCTION =
+      new Function<DnsRecord, ResourceRecordSet>() {
         @Override
         public com.google.api.services.dns.model.ResourceRecordSet apply(DnsRecord error) {
           return error.toPb();
@@ -281,29 +281,29 @@ com.google.api.services.dns.model.Change toPb() {
   }
 
   static ChangeRequest fromPb(com.google.api.services.dns.model.Change pb) {
-    Builder b = builder();
+    Builder builder = builder();
     if (pb.getId() != null) {
-      b.id(pb.getId());
+      builder.id(pb.getId());
     }
     if (pb.getStartTime() != null) {
-      b.startTimeMillis(DateTime.parse(pb.getStartTime()).getMillis());
+      builder.startTimeMillis(DateTime.parse(pb.getStartTime()).getMillis());
     }
     if (pb.getStatus() != null) {
       // we are assuming that status indicated in pb is a lower case version of the enum name
-      b.status(ChangeRequest.Status.valueOf(pb.getStatus().toUpperCase()));
+      builder.status(ChangeRequest.Status.valueOf(pb.getStatus().toUpperCase()));
     }
     if (pb.getDeletions() != null) {
-      b.deletions(Lists.transform(pb.getDeletions(), FROM_PB_FUNCTION));
+      builder.deletions(Lists.transform(pb.getDeletions(), FROM_PB_FUNCTION));
     }
     if (pb.getAdditions() != null) {
-      b.additions(Lists.transform(pb.getAdditions(), FROM_PB_FUNCTION));
+      builder.additions(Lists.transform(pb.getAdditions(), FROM_PB_FUNCTION));
     }
-    return b.build();
+    return builder.build();
   }
 
   @Override
-  public boolean equals(Object o) {
-    return (o instanceof ChangeRequest) && toPb().equals(((ChangeRequest) o).toPb());
+  public boolean equals(Object other) {
+    return (other instanceof ChangeRequest) && toPb().equals(((ChangeRequest) other).toPb());
   }
 
   @Override
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsRecord.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsRecord.java
@@ -273,14 +273,14 @@ com.google.api.services.dns.model.ResourceRecordSet toPb() {
   }
 
   static DnsRecord fromPb(com.google.api.services.dns.model.ResourceRecordSet pb) {
-    Builder b = builder(pb.getName(), Type.valueOf(pb.getType()));
+    Builder builder = builder(pb.getName(), Type.valueOf(pb.getType()));
     if (pb.getRrdatas() != null) {
-      b.records(pb.getRrdatas());
+      builder.records(pb.getRrdatas());
     }
     if (pb.getTtl() != null) {
-      b.ttl(pb.getTtl());
+      builder.ttl(pb.getTtl());
     }
-    return b.build();
+    return builder.build();
   }
 
   @Override
diff --git a/gcloud-java-dns/src/test/java/com/google/gcloud/dns/DnsRecordTest.java b/gcloud-java-dns/src/test/java/com/google/gcloud/dns/DnsRecordTest.java
@@ -17,9 +17,9 @@
 package com.google.gcloud.dns;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotEquals;
 
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -273,14 +273,14 @@ com.google.api.services.dns.model.ResourceRecordSet toPb() {`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`static DnsRecord fromPb(com.google.api.services.dns.model.ResourceRecordSet pb) {`
`276`		`- Builder b = builder(pb.getName(), Type.valueOf(pb.getType()));`
	`276`	`+ Builder builder = builder(pb.getName(), Type.valueOf(pb.getType()));`
`277`	`277`	`if (pb.getRrdatas() != null) {`
`278`		`- b.records(pb.getRrdatas());`
	`278`	`+ builder.records(pb.getRrdatas());`
`279`	`279`	`}`
`280`	`280`	`if (pb.getTtl() != null) {`
`281`		`- b.ttl(pb.getTtl());`
	`281`	`+ builder.ttl(pb.getTtl());`
`282`	`282`	`}`
`283`		`- return b.build();`
	`283`	`+ return builder.build();`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`@Override`