Skip to content

Commit 8c7b19f

Browse files
mziccardmziccard
committed
Update Dns examples, snippets and READMEs to use renamed getters/setters/builders
1 parent 5fdde09 commit 8c7b19f

8 files changed

Lines changed: 78 additions & 69 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,19 +359,19 @@ Dns dns = DnsOptions.defaultInstance().service();
359359
String zoneName = "my-unique-zone";
360360
Zone zone = dns.getZone(zoneName);
361361
String ip = "12.13.14.15";
362-
RecordSet toCreate = RecordSet.builder("www.someexampledomain.com.", RecordSet.Type.A)
363-
.ttl(24, TimeUnit.HOURS)
362+
RecordSet toCreate = RecordSet.newBuilder("www.someexampledomain.com.", RecordSet.Type.A)
363+
.setTtl(24, TimeUnit.HOURS)
364364
.addRecord(ip)
365365
.build();
366-
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.builder().add(toCreate);
366+
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder().add(toCreate);
367367
368368
// Verify that the record does not exist yet.
369369
// If it does exist, we will overwrite it with our prepared record.
370370
Iterator<RecordSet> recordSetIterator = zone.listRecordSets().iterateAll();
371371
while (recordSetIterator.hasNext()) {
372372
RecordSet current = recordSetIterator.next();
373-
if (toCreate.name().equals(current.name()) &&
374-
toCreate.type().equals(current.type())) {
373+
if (toCreate.name().equals(current.getName()) &&
374+
toCreate.type().equals(current.getType())) {
375375
changeBuilder.delete(current);
376376
}
377377
}

‎TESTING.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,11 @@ You can test against an in-memory local DNS by following these steps:
131131
The `delay` parameter determines if change requests should be processed synchronously
132132
(value `0`) or in a separate thread with a minimum of delay of `delay` milliseconds.
133133

134-
2. In your program, create the DNS service by using the helper's `options()` method. For example:
134+
2. In your program, create the DNS service by using the helper's `getOptions()` method.
135+
For example:
135136

136137
```java
137-
Dns dns = LocalDnsHelper.options().service();
138+
Dns dns = LocalDnsHelper.getOptions().service();
138139
```
139140

140141
3. Run your tests.

‎google-cloud-dns/README.md‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ZoneInfo zoneInfo = ZoneInfo.of(zoneName, domainName, description);
125125

126126
// Create zone in Google Cloud DNS
127127
Zone zone = dns.create(zoneInfo);
128-
System.out.printf("Zone was created and assigned ID %s.%n", zone.generatedId());
128+
System.out.printf("Zone was created and assigned ID %s.%n", zone.getGeneratedId());
129129
```
130130

131131
You now have an empty zone hosted in Google Cloud DNS which is ready to be populated with
@@ -142,7 +142,7 @@ and then add
142142

143143
```java
144144
// Print assigned name servers
145-
List<String> nameServers = zone.nameServers();
145+
List<String> nameServers = zone.getNameServers();
146146
for(String nameServer : nameServers) {
147147
System.out.println(nameServer);
148148
}
@@ -170,13 +170,13 @@ and proceed with:
170170
```java
171171
// Prepare a www.someexampledomain.com. type A record set with ttl of 24 hours
172172
String ip = "12.13.14.15";
173-
RecordSet toCreate = RecordSet.builder("www." + zone.dnsName(), RecordSet.Type.A)
174-
.ttl(24, TimeUnit.HOURS)
173+
RecordSet toCreate = RecordSet.newBuilder("www." + zone.dnsName(), RecordSet.Type.A)
174+
.setTtl(24, TimeUnit.HOURS)
175175
.addRecord(ip)
176176
.build();
177177

178178
// Make a change
179-
ChangeRequestInfo changeRequest = ChangeRequestInfo.builder().add(toCreate).build();
179+
ChangeRequestInfo changeRequest = ChangeRequestInfo.newBuilder().add(toCreate).build();
180180

181181
// Build and apply the change request to our zone
182182
changeRequest = zone.applyChangeRequest(changeRequest);
@@ -205,7 +205,8 @@ ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.builder().add(toCrea
205205
Iterator<RecordSet> recordSetIterator = zone.listRecordSets().iterateAll();
206206
while (recordSetIterator.hasNext()) {
207207
RecordSet current = recordSetIterator.next();
208-
if (toCreate.name().equals(current.name()) && toCreate.type().equals(current.type())) {
208+
if (toCreate.getName().equals(current.getName())
209+
&& toCreate.getType().equals(current.getType())) {
209210
changeBuilder.delete(current);
210211
}
211212
}
@@ -255,7 +256,7 @@ while (zoneIterator.hasNext()) {
255256

256257
// List the record sets in a particular zone
257258
recordSetIterator = zone.listRecordSets().iterateAll();
258-
System.out.println(String.format("Record sets inside %s:", zone.name()));
259+
System.out.println(String.format("Record sets inside %s:", zone.getName()));
259260
while (recordSetIterator.hasNext()) {
260261
System.out.println(recordSetIterator.next());
261262
}
@@ -274,7 +275,7 @@ and then:
274275

275276
// List the change requests applied to a particular zone
276277
Iterator<ChangeRequest> changeIterator = zone.listChangeRequests().iterateAll();
277-
System.out.println(String.format("The history of changes in %s:", zone.name()));
278+
System.out.println(String.format("The history of changes in %s:", zone.getName()));
278279
while (changeIterator.hasNext()) {
279280
System.out.println(changeIterator.next());
280281
}
@@ -287,18 +288,19 @@ First, you need to empty the zone by deleting all its records except for the def
287288

288289
```java
289290
// Make a change for deleting the record sets
290-
changeBuilder = ChangeRequestInfo.builder();
291+
changeBuilder = ChangeRequestInfo.newBuilder();
291292
while (recordIterator.hasNext()) {
292293
RecordSet current = recordIterator.next();
293294
// SOA and NS records cannot be deleted
294-
if (!RecordSet.Type.SOA.equals(current.type()) && !RecordSet.Type.NS.equals(current.type())) {
295+
if (!RecordSet.Type.SOA.equals(current.getType())
296+
&& !RecordSet.Type.NS.equals(current.getType())) {
295297
changeBuilder.delete(current);
296298
}
297299
}
298300

299301
// Build and apply the change request to our zone if it contains records to delete
300302
ChangeRequestInfo changeRequest = changeBuilder.build();
301-
if (!changeRequest.deletions().isEmpty()) {
303+
if (!changeRequest.getDeletions().isEmpty()) {
302304
ChangeRequest pendingRequest = dns.applyChangeRequest(zoneName, changeRequest);
303305

304306
// Wait for the change request to complete
@@ -325,7 +327,7 @@ if (result) {
325327
#### Complete Source Code
326328

327329
We composed some of the aforementioned snippets into complete executable code samples. In
328-
[CreateZones.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateZone.java)
330+
[CreateZone.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateZone.java)
329331
we create a zone. In [CreateOrUpdateRecordSets.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java)
330332
we create a type A record set for a zone, or update an existing type A record set to a new IP address. We
331333
demonstrate how to delete a zone in [DeleteZone.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java).

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void run(Dns dns, String... args) {
8787
ZoneInfo zoneInfo = ZoneInfo.of(zoneName, dnsName, description);
8888
Zone zone = dns.create(zoneInfo);
8989
System.out.printf("Successfully created zone with name %s which was assigned ID %s.%n",
90-
zone.name(), zone.generatedId());
90+
zone.getName(), zone.getGeneratedId());
9191
}
9292

9393
@Override
@@ -201,16 +201,17 @@ public void run(Dns dns, String... args) {
201201
if (args.length > 3) {
202202
ttl = Integer.parseInt(args[3]);
203203
}
204-
RecordSet recordSet = RecordSet.builder(recordName, RecordSet.Type.A)
205-
.records(ImmutableList.of(ip))
206-
.ttl(ttl, TimeUnit.SECONDS)
204+
RecordSet recordSet = RecordSet.newBuilder(recordName, RecordSet.Type.A)
205+
.setRecords(ImmutableList.of(ip))
206+
.setTtl(ttl, TimeUnit.SECONDS)
207207
.build();
208-
ChangeRequestInfo changeRequest = ChangeRequest.builder()
208+
ChangeRequestInfo changeRequest = ChangeRequest.newBuilder()
209209
.delete(recordSet)
210210
.build();
211211
changeRequest = dns.applyChangeRequest(zoneName, changeRequest);
212212
System.out.printf("The request for deleting A record %s for zone %s was successfully "
213-
+ "submitted and assigned ID %s.%n", recordName, zoneName, changeRequest.generatedId());
213+
+ "submitted and assigned ID %s.%n", recordName, zoneName,
214+
changeRequest.getGeneratedId());
214215
System.out.print("Waiting for deletion to happen...");
215216
waitForChangeToFinish(dns, zoneName, changeRequest);
216217
System.out.printf("%nThe deletion has been completed.%n");
@@ -248,14 +249,15 @@ public void run(Dns dns, String... args) {
248249
if (args.length > 3) {
249250
ttl = Integer.parseInt(args[3]);
250251
}
251-
RecordSet recordSet = RecordSet.builder(recordName, RecordSet.Type.A)
252-
.records(ImmutableList.of(ip))
253-
.ttl(ttl, TimeUnit.SECONDS)
252+
RecordSet recordSet = RecordSet.newBuilder(recordName, RecordSet.Type.A)
253+
.setRecords(ImmutableList.of(ip))
254+
.setTtl(ttl, TimeUnit.SECONDS)
254255
.build();
255-
ChangeRequestInfo changeRequest = ChangeRequest.builder().add(recordSet).build();
256+
ChangeRequestInfo changeRequest = ChangeRequest.newBuilder().add(recordSet).build();
256257
changeRequest = dns.applyChangeRequest(zoneName, changeRequest);
257258
System.out.printf("The request for adding A record %s for zone %s was successfully "
258-
+ "submitted and assigned ID %s.%n", recordName, zoneName, changeRequest.generatedId());
259+
+ "submitted and assigned ID %s.%n", recordName, zoneName,
260+
changeRequest.getGeneratedId());
259261
System.out.print("Waiting for addition to happen...");
260262
waitForChangeToFinish(dns, zoneName, changeRequest);
261263
System.out.printf("The addition has been completed.%n");
@@ -291,8 +293,8 @@ public void run(Dns dns, String... args) {
291293
System.out.printf("Record sets for zone %s:%n", zoneName);
292294
while (iterator.hasNext()) {
293295
RecordSet recordSet = iterator.next();
294-
System.out.printf("%nRecord name: %s%nTTL: %s%nRecords: %s%n", recordSet.name(),
295-
recordSet.ttl(), Joiner.on(", ").join(recordSet.records()));
296+
System.out.printf("%nRecord name: %s%nTTL: %s%nRecords: %s%n", recordSet.getName(),
297+
recordSet.getTtl(), Joiner.on(", ").join(recordSet.getRecords()));
296298
}
297299
} else {
298300
System.out.printf("Zone %s has no record sets records.%n", zoneName);
@@ -331,11 +333,11 @@ public void run(Dns dns, String... args) {
331333
System.out.printf("Change requests for zone %s:%n", zoneName);
332334
while (iterator.hasNext()) {
333335
ChangeRequest change = iterator.next();
334-
System.out.printf("%nID: %s%n", change.generatedId());
336+
System.out.printf("%nID: %s%n", change.getGeneratedId());
335337
System.out.printf("Status: %s%n", change.status());
336-
System.out.printf("Started: %s%n", FORMATTER.print(change.startTimeMillis()));
337-
System.out.printf("Deletions: %s%n", Joiner.on(", ").join(change.deletions()));
338-
System.out.printf("Additions: %s%n", Joiner.on(", ").join(change.additions()));
338+
System.out.printf("Started: %s%n", FORMATTER.print(change.getStartTimeMillis()));
339+
System.out.printf("Deletions: %s%n", Joiner.on(", ").join(change.getDeletions()));
340+
System.out.printf("Additions: %s%n", Joiner.on(", ").join(change.getAdditions()));
339341
}
340342
} else {
341343
System.out.printf("Zone %s has no change requests.%n", zoneName);
@@ -401,16 +403,16 @@ private static class GetProjectAction implements DnsAction {
401403
@Override
402404
public void run(Dns dns, String... args) {
403405
ProjectInfo project = dns.getProject();
404-
ProjectInfo.Quota quota = project.quota();
406+
ProjectInfo.Quota quota = project.getQuota();
405407
System.out.printf("Project id: %s%nQuota:%n", dns.options().projectId());
406-
System.out.printf("\tZones: %d%n", quota.zones());
407-
System.out.printf("\tRecord sets per zone: %d%n", quota.rrsetsPerZone());
408+
System.out.printf("\tZones: %d%n", quota.getZones());
409+
System.out.printf("\tRecord sets per zone: %d%n", quota.getRrsetsPerZone());
408410
System.out.printf("\tRecord sets per DNS record: %d%n",
409-
quota.resourceRecordsPerRrset());
410-
System.out.printf("\tAdditions per change: %d%n", quota.rrsetAdditionsPerChange());
411-
System.out.printf("\tDeletions per change: %d%n", quota.rrsetDeletionsPerChange());
411+
quota.getResourceRecordsPerRrset());
412+
System.out.printf("\tAdditions per change: %d%n", quota.getRrsetAdditionsPerChange());
413+
System.out.printf("\tDeletions per change: %d%n", quota.getRrsetDeletionsPerChange());
412414
System.out.printf("\tTotal data size per change: %d%n",
413-
quota.totalRrdataSizePerChange());
415+
quota.getTotalRrdataSizePerChange());
414416
}
415417

416418
@Override
@@ -435,11 +437,11 @@ public boolean check(String... args) {
435437
}
436438

437439
private static void printZone(Zone zone) {
438-
System.out.printf("%nName: %s%n", zone.name());
439-
System.out.printf("ID: %s%n", zone.generatedId());
440-
System.out.printf("Description: %s%n", zone.description());
441-
System.out.printf("Created: %s%n", FORMATTER.print(zone.creationTimeMillis()));
442-
System.out.printf("Name servers: %s%n", Joiner.on(", ").join(zone.nameServers()));
440+
System.out.printf("%nName: %s%n", zone.getName());
441+
System.out.printf("ID: %s%n", zone.getGeneratedId());
442+
System.out.printf("Description: %s%n", zone.getDescription());
443+
System.out.printf("Created: %s%n", FORMATTER.print(zone.getCreationTimeMillis()));
444+
System.out.printf("Name servers: %s%n", Joiner.on(", ").join(zone.getNameServers()));
443445
}
444446

445447
private static ChangeRequestInfo waitForChangeToFinish(Dns dns, String zoneName,
@@ -452,7 +454,7 @@ private static ChangeRequestInfo waitForChangeToFinish(Dns dns, String zoneName,
452454
} catch (InterruptedException e) {
453455
System.err.println("Thread was interrupted while waiting.");
454456
}
455-
current = dns.getChangeRequest(zoneName, current.generatedId());
457+
current = dns.getChangeRequest(zoneName, current.getGeneratedId());
456458
}
457459
return current;
458460
}

‎google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,21 @@ public static void main(String... args) {
4949

5050
// Prepare a <i>www.<zone-domain>.</i> type A record set with ttl of 24 hours
5151
String ip = "12.13.14.15";
52-
RecordSet toCreate = RecordSet.builder("www." + zone.dnsName(), RecordSet.Type.A)
53-
.ttl(24, TimeUnit.HOURS)
52+
RecordSet toCreate = RecordSet.newBuilder("www." + zone.getDnsName(), RecordSet.Type.A)
53+
.setTtl(24, TimeUnit.HOURS)
5454
.addRecord(ip)
5555
.build();
5656

5757
// Make a change
58-
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.builder().add(toCreate);
58+
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder().add(toCreate);
5959

6060
// Verify a www.<zone-domain>. type A record does not exist yet.
6161
// If it does exist, we will overwrite it with our prepared record.
6262
Iterator<RecordSet> recordSetIterator = zone.listRecordSets().iterateAll();
6363
while (recordSetIterator.hasNext()) {
6464
RecordSet current = recordSetIterator.next();
65-
if (toCreate.name().equals(current.name()) && toCreate.type().equals(current.type())) {
65+
if (toCreate.getName().equals(current.getName())
66+
&& toCreate.getType().equals(current.getType())) {
6667
changeBuilder.delete(current);
6768
}
6869
}

‎google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateZone.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public static void main(String... args) {
4646

4747
// Create zone in Google Cloud DNS
4848
Zone zone = dns.create(zoneInfo);
49-
System.out.printf("Zone was created and assigned ID %s.%n", zone.generatedId());
49+
System.out.printf("Zone was created and assigned ID %s.%n", zone.getGeneratedId());
5050
}
5151
}

‎google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,19 @@ public static void main(String... args) {
4848
Iterator<RecordSet> recordIterator = dns.listRecordSets(zoneName).iterateAll();
4949

5050
// Make a change for deleting the records
51-
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.builder();
51+
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder();
5252
while (recordIterator.hasNext()) {
5353
RecordSet current = recordIterator.next();
5454
// SOA and NS records cannot be deleted
55-
if (!RecordSet.Type.SOA.equals(current.type()) && !RecordSet.Type.NS.equals(current.type())) {
55+
if (!RecordSet.Type.SOA.equals(current.getType())
56+
&& !RecordSet.Type.NS.equals(current.getType())) {
5657
changeBuilder.delete(current);
5758
}
5859
}
5960

6061
// Build and apply the change request to our zone if it contains records to delete
6162
ChangeRequestInfo changeRequest = changeBuilder.build();
62-
if (!changeRequest.deletions().isEmpty()) {
63+
if (!changeRequest.getDeletions().isEmpty()) {
6364
ChangeRequest pendingRequest = dns.applyChangeRequest(zoneName, changeRequest);
6465

6566
// Wait for the change request to complete

0 commit comments

Comments
 (0)