Skip to content

Commit 43e7b53

Browse files
mderkamderka
committed
Did more DnsRecord renames. Fixed build problem.
1 parent bc51bd1 commit 43e7b53

9 files changed

Lines changed: 100 additions & 102 deletions

File tree

‎gcloud-java-dns/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ ChangeRequest changeRequest = ChangeRequest.builder().add(toCreate).build();
182182
changeRequest = zone.applyChangeRequest(changeRequest);
183183
```
184184

185-
The `addRecord` method of `RecordSet.Builder` accepts record sets in the form of
185+
The `addRecord` method of `RecordSet.Builder` accepts records in the form of
186186
strings. The format of the strings depends on the type of the record sets to be added.
187187
More information on the supported record set types and record formats can be found [here](https://cloud.google.com/dns/what-is-cloud-dns#supported_record_types).
188188

‎gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private static class DnsRecordPageFetcher implements PageImpl.NextPageFetcher<Re
102102

103103
@Override
104104
public Page<RecordSet> nextPage() {
105-
return listDnsRecords(zoneName, serviceOptions, requestOptions);
105+
return listRecordSets(zoneName, serviceOptions, requestOptions);
106106
}
107107
}
108108

@@ -179,10 +179,10 @@ public DnsRpc.ListResult<Change> call() {
179179

180180
@Override
181181
public Page<RecordSet> listRecordSets(String zoneName, RecordSetListOption... options) {
182-
return listDnsRecords(zoneName, options(), optionMap(options));
182+
return listRecordSets(zoneName, options(), optionMap(options));
183183
}
184184

185-
private static Page<RecordSet> listDnsRecords(final String zoneName,
185+
private static Page<RecordSet> listRecordSets(final String zoneName,
186186
final DnsOptions serviceOptions, final Map<DnsRpc.Option, ?> optionsMap) {
187187
try {
188188
// get a list of record sets
@@ -196,11 +196,11 @@ public DnsRpc.ListResult<ResourceRecordSet> call() {
196196
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
197197
String cursor = result.pageToken();
198198
// transform that list into record sets
199-
Iterable<RecordSet> records = result.results() == null
199+
Iterable<RecordSet> recordSets = result.results() == null
200200
? ImmutableList.<RecordSet>of()
201201
: Iterables.transform(result.results(), RecordSet.FROM_PB_FUNCTION);
202202
return new PageImpl<>(new DnsRecordPageFetcher(zoneName, serviceOptions, cursor, optionsMap),
203-
cursor, records);
203+
cursor, recordSets);
204204
} catch (RetryHelperException e) {
205205
throw DnsException.translateAndThrow(e);
206206
}

‎gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22+
import com.google.api.services.dns.model.ResourceRecordSet;
2223
import com.google.common.base.Function;
2324
import com.google.common.base.MoreObjects;
2425
import com.google.common.collect.ImmutableList;
@@ -44,20 +45,18 @@
4445
*/
4546
public class RecordSet implements Serializable {
4647

47-
static final Function<com.google.api.services.dns.model.ResourceRecordSet, RecordSet>
48-
FROM_PB_FUNCTION =
49-
new Function<com.google.api.services.dns.model.ResourceRecordSet, RecordSet>() {
48+
static final Function<ResourceRecordSet, RecordSet> FROM_PB_FUNCTION =
49+
new Function<ResourceRecordSet, RecordSet>() {
5050
@Override
51-
public RecordSet apply(com.google.api.services.dns.model.ResourceRecordSet pb) {
51+
public RecordSet apply(ResourceRecordSet pb) {
5252
return RecordSet.fromPb(pb);
5353
}
5454
};
55-
static final Function<RecordSet, com.google.api.services.dns.model.ResourceRecordSet>
56-
TO_PB_FUNCTION =
57-
new Function<RecordSet, com.google.api.services.dns.model.ResourceRecordSet>() {
55+
static final Function<RecordSet, ResourceRecordSet> TO_PB_FUNCTION =
56+
new Function<RecordSet, ResourceRecordSet>() {
5857
@Override
59-
public com.google.api.services.dns.model.ResourceRecordSet apply(RecordSet error) {
60-
return error.toPb();
58+
public ResourceRecordSet apply(RecordSet recordSet) {
59+
return recordSet.toPb();
6160
}
6261
};
6362
private static final long serialVersionUID = 8148009870800115261L;
@@ -187,7 +186,7 @@ public Builder records(List<String> records) {
187186
}
188187

189188
/**
190-
* Sets name for this record set. For example, www.example.com.
189+
* Sets the name for this record set. For example, www.example.com.
191190
*/
192191
public Builder name(String name) {
193192
this.name = checkNotNull(name);
@@ -283,8 +282,7 @@ public int hashCode() {
283282

284283
@Override
285284
public boolean equals(Object obj) {
286-
return obj instanceof RecordSet
287-
&& Objects.equals(this.toPb(), ((RecordSet) obj).toPb());
285+
return obj instanceof RecordSet && Objects.equals(this.toPb(), ((RecordSet) obj).toPb());
288286
}
289287

290288
com.google.api.services.dns.model.ResourceRecordSet toPb() {

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/DnsTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,35 @@ public class DnsTest {
3030
private static final String DNS_NAME = "www.example.com.";
3131

3232
@Test
33-
public void testDnsRecordListOption() {
33+
public void testRecordSetListOption() {
3434
// dns name
3535
String dnsName = "some name";
36-
Dns.RecordSetListOption rrsetListOption = Dns.RecordSetListOption.dnsName(dnsName);
37-
assertEquals(dnsName, rrsetListOption.value());
38-
assertEquals(DnsRpc.Option.NAME, rrsetListOption.rpcOption());
36+
Dns.RecordSetListOption recordSetListOption = Dns.RecordSetListOption.dnsName(dnsName);
37+
assertEquals(dnsName, recordSetListOption.value());
38+
assertEquals(DnsRpc.Option.NAME, recordSetListOption.rpcOption());
3939
// page token
40-
rrsetListOption = Dns.RecordSetListOption.pageToken(PAGE_TOKEN);
41-
assertEquals(PAGE_TOKEN, rrsetListOption.value());
42-
assertEquals(DnsRpc.Option.PAGE_TOKEN, rrsetListOption.rpcOption());
40+
recordSetListOption = Dns.RecordSetListOption.pageToken(PAGE_TOKEN);
41+
assertEquals(PAGE_TOKEN, recordSetListOption.value());
42+
assertEquals(DnsRpc.Option.PAGE_TOKEN, recordSetListOption.rpcOption());
4343
// page size
44-
rrsetListOption = Dns.RecordSetListOption.pageSize(PAGE_SIZE);
45-
assertEquals(PAGE_SIZE, rrsetListOption.value());
46-
assertEquals(DnsRpc.Option.PAGE_SIZE, rrsetListOption.rpcOption());
44+
recordSetListOption = Dns.RecordSetListOption.pageSize(PAGE_SIZE);
45+
assertEquals(PAGE_SIZE, recordSetListOption.value());
46+
assertEquals(DnsRpc.Option.PAGE_SIZE, recordSetListOption.rpcOption());
4747
// record type
4848
RecordSet.Type recordType = RecordSet.Type.AAAA;
49-
rrsetListOption = Dns.RecordSetListOption.type(recordType);
50-
assertEquals(recordType.name(), rrsetListOption.value());
51-
assertEquals(DnsRpc.Option.DNS_TYPE, rrsetListOption.rpcOption());
49+
recordSetListOption = Dns.RecordSetListOption.type(recordType);
50+
assertEquals(recordType.name(), recordSetListOption.value());
51+
assertEquals(DnsRpc.Option.DNS_TYPE, recordSetListOption.rpcOption());
5252
// fields
53-
rrsetListOption = Dns.RecordSetListOption.fields(Dns.RecordSetField.NAME,
53+
recordSetListOption = Dns.RecordSetListOption.fields(Dns.RecordSetField.NAME,
5454
Dns.RecordSetField.TTL);
55-
assertEquals(DnsRpc.Option.FIELDS, rrsetListOption.rpcOption());
56-
assertTrue(rrsetListOption.value() instanceof String);
57-
assertTrue(((String) rrsetListOption.value()).contains(
55+
assertEquals(DnsRpc.Option.FIELDS, recordSetListOption.rpcOption());
56+
assertTrue(recordSetListOption.value() instanceof String);
57+
assertTrue(((String) recordSetListOption.value()).contains(
5858
Dns.RecordSetField.NAME.selector()));
59-
assertTrue(((String) rrsetListOption.value()).contains(
59+
assertTrue(((String) recordSetListOption.value()).contains(
6060
Dns.RecordSetField.TTL.selector()));
61-
assertTrue(((String) rrsetListOption.value()).contains(
61+
assertTrue(((String) recordSetListOption.value()).contains(
6262
Dns.RecordSetField.NAME.selector()));
6363
}
6464

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/RecordSetTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public class RecordSetTest {
3939

4040
@Test
4141
public void testDefaultDnsRecord() {
42-
RecordSet record = builder(NAME, TYPE).build();
43-
assertEquals(0, record.records().size());
44-
assertEquals(TYPE, record.type());
45-
assertEquals(NAME, record.name());
42+
RecordSet recordSet = builder(NAME, TYPE).build();
43+
assertEquals(0, recordSet.records().size());
44+
assertEquals(TYPE, recordSet.type());
45+
assertEquals(NAME, recordSet.name());
4646
}
4747

4848
@Test

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/SerializationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SerializationTest extends BaseSerializationTest {
4545
.build();
4646
private static final Dns.ZoneListOption ZONE_LIST_OPTION =
4747
Dns.ZoneListOption.dnsName("www.example.com.");
48-
private static final Dns.RecordSetListOption DNS_REOCRD_LIST_OPTION =
48+
private static final Dns.RecordSetListOption RECORD_SET_LIST_OPTION =
4949
Dns.RecordSetListOption.fields(Dns.RecordSetField.TTL);
5050
private static final Dns.ChangeRequestListOption CHANGE_REQUEST_LIST_OPTION =
5151
Dns.ChangeRequestListOption.fields(Dns.ChangeRequestField.STATUS);
@@ -89,9 +89,9 @@ protected Serializable[] serializableObjects() {
8989
.authCredentials(null)
9090
.build();
9191
return new Serializable[]{FULL_ZONE_INFO, PARTIAL_ZONE_INFO, ZONE_LIST_OPTION,
92-
DNS_REOCRD_LIST_OPTION, CHANGE_REQUEST_LIST_OPTION, ZONE_OPTION, CHANGE_REQUEST_OPTION,
92+
RECORD_SET_LIST_OPTION, CHANGE_REQUEST_LIST_OPTION, ZONE_OPTION, CHANGE_REQUEST_OPTION,
9393
PROJECT_OPTION, PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, OPTIONS, FULL_ZONE, PARTIAL_ZONE,
94-
OPTIONS, CHANGE_REQUEST_PARTIAL, DNS_RECORD_PARTIAL, DNS_RECORD_COMPLETE,
94+
OPTIONS, CHANGE_REQUEST_PARTIAL, RECORD_SET_PARTIAL, RECORD_SET_COMPLETE,
9595
CHANGE_REQUEST_COMPLETE, options, otherOptions};
9696
}
9797

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ private static void clear() {
9898
while (iterator.hasNext()) {
9999
waitForChangeToComplete(zoneName, iterator.next().id());
100100
}
101-
Iterator<RecordSet> recordIterator = zone.listRecordSets().iterateAll();
101+
Iterator<RecordSet> recordSetIterator = zone.listRecordSets().iterateAll();
102102
List<RecordSet> toDelete = new LinkedList<>();
103-
while (recordIterator.hasNext()) {
104-
RecordSet record = recordIterator.next();
103+
while (recordSetIterator.hasNext()) {
104+
RecordSet recordSet = recordSetIterator.next();
105105
if (!ImmutableList.of(RecordSet.Type.NS, RecordSet.Type.SOA)
106-
.contains(record.type())) {
107-
toDelete.add(record);
106+
.contains(recordSet.type())) {
107+
toDelete.add(recordSet);
108108
}
109109
}
110110
if (!toDelete.isEmpty()) {
@@ -597,7 +597,7 @@ public void testInvalidChangeRequest() {
597597
zone.applyChangeRequest(validChange);
598598
try {
599599
zone.applyChangeRequest(validChange);
600-
fail("Created a record which already exists.");
600+
fail("Created a record set which already exists.");
601601
} catch (DnsException ex) {
602602
// expected
603603
assertFalse(ex.retryable());
@@ -608,22 +608,22 @@ public void testInvalidChangeRequest() {
608608
ChangeRequest deletion = ChangeRequest.builder().delete(mismatch).build();
609609
try {
610610
zone.applyChangeRequest(deletion);
611-
fail("Deleted a record without a complete match.");
611+
fail("Deleted a record set without a complete match.");
612612
} catch (DnsException ex) {
613613
// expected
614614
assertEquals(412, ex.code());
615615
assertFalse(ex.retryable());
616616
}
617617
// delete and add SOA
618-
Iterator<RecordSet> recordIterator = zone.listRecordSets().iterateAll();
618+
Iterator<RecordSet> recordSetIteratorrator = zone.listRecordSets().iterateAll();
619619
LinkedList<RecordSet> deletions = new LinkedList<>();
620620
LinkedList<RecordSet> additions = new LinkedList<>();
621-
while (recordIterator.hasNext()) {
622-
RecordSet record = recordIterator.next();
623-
if (record.type() == RecordSet.Type.SOA) {
624-
deletions.add(record);
621+
while (recordSetIteratorrator.hasNext()) {
622+
RecordSet recordSet = recordSetIteratorrator.next();
623+
if (recordSet.type() == RecordSet.Type.SOA) {
624+
deletions.add(recordSet);
625625
// the subdomain is necessary to get 400 instead of 412
626-
RecordSet copy = record.toBuilder().name("x." + record.name()).build();
626+
RecordSet copy = recordSet.toBuilder().name("x." + recordSet.name()).build();
627627
additions.add(copy);
628628
break;
629629
}
@@ -838,88 +838,88 @@ public void testListDnsRecords() {
838838
assertEquals(2, recordSets.size());
839839
ImmutableList<RecordSet.Type> defaultRecords =
840840
ImmutableList.of(RecordSet.Type.NS, RecordSet.Type.SOA);
841-
for (RecordSet record : recordSets) {
842-
assertTrue(defaultRecords.contains(record.type()));
841+
for (RecordSet recordSet : recordSets) {
842+
assertTrue(defaultRecords.contains(recordSet.type()));
843843
}
844844
// field options
845-
Iterator<RecordSet> dnsRecordIterator = DNS.listRecordSets(zone.name(),
845+
Iterator<RecordSet> recordSetIterator = DNS.listRecordSets(zone.name(),
846846
Dns.RecordSetListOption.fields(Dns.RecordSetField.TTL)).iterateAll();
847847
int counter = 0;
848-
while (dnsRecordIterator.hasNext()) {
849-
RecordSet record = dnsRecordIterator.next();
850-
assertEquals(recordSets.get(counter).ttl(), record.ttl());
851-
assertEquals(recordSets.get(counter).name(), record.name());
852-
assertEquals(recordSets.get(counter).type(), record.type());
853-
assertTrue(record.records().isEmpty());
848+
while (recordSetIterator.hasNext()) {
849+
RecordSet recordSet = recordSetIterator.next();
850+
assertEquals(recordSets.get(counter).ttl(), recordSet.ttl());
851+
assertEquals(recordSets.get(counter).name(), recordSet.name());
852+
assertEquals(recordSets.get(counter).type(), recordSet.type());
853+
assertTrue(recordSet.records().isEmpty());
854854
counter++;
855855
}
856856
assertEquals(2, counter);
857-
dnsRecordIterator = DNS.listRecordSets(zone.name(),
857+
recordSetIterator = DNS.listRecordSets(zone.name(),
858858
Dns.RecordSetListOption.fields(Dns.RecordSetField.NAME)).iterateAll();
859859
counter = 0;
860-
while (dnsRecordIterator.hasNext()) {
861-
RecordSet record = dnsRecordIterator.next();
862-
assertEquals(recordSets.get(counter).name(), record.name());
863-
assertEquals(recordSets.get(counter).type(), record.type());
864-
assertTrue(record.records().isEmpty());
865-
assertNull(record.ttl());
860+
while (recordSetIterator.hasNext()) {
861+
RecordSet recordSet = recordSetIterator.next();
862+
assertEquals(recordSets.get(counter).name(), recordSet.name());
863+
assertEquals(recordSets.get(counter).type(), recordSet.type());
864+
assertTrue(recordSet.records().isEmpty());
865+
assertNull(recordSet.ttl());
866866
counter++;
867867
}
868868
assertEquals(2, counter);
869-
dnsRecordIterator = DNS.listRecordSets(zone.name(),
869+
recordSetIterator = DNS.listRecordSets(zone.name(),
870870
Dns.RecordSetListOption.fields(Dns.RecordSetField.DNS_RECORDS))
871871
.iterateAll();
872872
counter = 0;
873-
while (dnsRecordIterator.hasNext()) {
874-
RecordSet record = dnsRecordIterator.next();
875-
assertEquals(recordSets.get(counter).records(), record.records());
876-
assertEquals(recordSets.get(counter).name(), record.name());
877-
assertEquals(recordSets.get(counter).type(), record.type());
878-
assertNull(record.ttl());
873+
while (recordSetIterator.hasNext()) {
874+
RecordSet recordSet = recordSetIterator.next();
875+
assertEquals(recordSets.get(counter).records(), recordSet.records());
876+
assertEquals(recordSets.get(counter).name(), recordSet.name());
877+
assertEquals(recordSets.get(counter).type(), recordSet.type());
878+
assertNull(recordSet.ttl());
879879
counter++;
880880
}
881881
assertEquals(2, counter);
882-
dnsRecordIterator = DNS.listRecordSets(zone.name(),
882+
recordSetIterator = DNS.listRecordSets(zone.name(),
883883
Dns.RecordSetListOption.fields(Dns.RecordSetField.TYPE),
884884
Dns.RecordSetListOption.pageSize(1)).iterateAll(); // also test paging
885885
counter = 0;
886-
while (dnsRecordIterator.hasNext()) {
887-
RecordSet record = dnsRecordIterator.next();
888-
assertEquals(recordSets.get(counter).type(), record.type());
889-
assertEquals(recordSets.get(counter).name(), record.name());
890-
assertTrue(record.records().isEmpty());
891-
assertNull(record.ttl());
886+
while (recordSetIterator.hasNext()) {
887+
RecordSet recordSet = recordSetIterator.next();
888+
assertEquals(recordSets.get(counter).type(), recordSet.type());
889+
assertEquals(recordSets.get(counter).name(), recordSet.name());
890+
assertTrue(recordSet.records().isEmpty());
891+
assertNull(recordSet.ttl());
892892
counter++;
893893
}
894894
assertEquals(2, counter);
895895
// test page size
896-
Page<RecordSet> dnsRecordPage = DNS.listRecordSets(zone.name(),
896+
Page<RecordSet> recordSetPage = DNS.listRecordSets(zone.name(),
897897
Dns.RecordSetListOption.fields(Dns.RecordSetField.TYPE),
898898
Dns.RecordSetListOption.pageSize(1));
899-
assertEquals(1, ImmutableList.copyOf(dnsRecordPage.values().iterator()).size());
899+
assertEquals(1, ImmutableList.copyOf(recordSetPage.values().iterator()).size());
900900
// test name filter
901901
ChangeRequest change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1);
902902
waitForChangeToComplete(ZONE1.name(), change.id());
903-
dnsRecordIterator = DNS.listRecordSets(ZONE1.name(),
903+
recordSetIterator = DNS.listRecordSets(ZONE1.name(),
904904
Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.name())).iterateAll();
905905
counter = 0;
906-
while (dnsRecordIterator.hasNext()) {
907-
RecordSet record = dnsRecordIterator.next();
906+
while (recordSetIterator.hasNext()) {
907+
RecordSet recordSet = recordSetIterator.next();
908908
assertTrue(ImmutableList.of(A_RECORD_ZONE1.type(), AAAA_RECORD_ZONE1.type())
909-
.contains(record.type()));
909+
.contains(recordSet.type()));
910910
counter++;
911911
}
912912
assertEquals(2, counter);
913913
// test type filter
914914
waitForChangeToComplete(ZONE1.name(), change.id());
915-
dnsRecordIterator = DNS.listRecordSets(ZONE1.name(),
915+
recordSetIterator = DNS.listRecordSets(ZONE1.name(),
916916
Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.name()),
917917
Dns.RecordSetListOption.type(A_RECORD_ZONE1.type()))
918918
.iterateAll();
919919
counter = 0;
920-
while (dnsRecordIterator.hasNext()) {
921-
RecordSet record = dnsRecordIterator.next();
922-
assertEquals(A_RECORD_ZONE1, record);
920+
while (recordSetIterator.hasNext()) {
921+
RecordSet recordSet = recordSetIterator.next();
922+
assertEquals(A_RECORD_ZONE1, recordSet);
923923
counter++;
924924
}
925925
assertEquals(1, counter);

‎gcloud-java-examples/src/main/java/com/google/gcloud/examples/dns/DnsExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ public void run(Dns dns, String... args) {
203203
if (args.length > 3) {
204204
ttl = Integer.parseInt(args[3]);
205205
}
206-
RecordSet record = RecordSet.builder(recordName, RecordSet.Type.A)
206+
RecordSet recordSet = RecordSet.builder(recordName, RecordSet.Type.A)
207207
.records(ImmutableList.of(ip))
208208
.ttl(ttl, TimeUnit.SECONDS)
209209
.build();
210210
ChangeRequest changeRequest = ChangeRequest.builder()
211-
.delete(record)
211+
.delete(recordSet)
212212
.build();
213213
changeRequest = dns.applyChangeRequest(zoneName, changeRequest);
214214
System.out.printf("The request for deleting A record %s for zone %s was successfully "

0 commit comments

Comments
 (0)