Skip to content

Commit a26bd59

Browse files
mziccardmziccard
committed
Merge pull request #736 from mderka/zone-of
ZoneInfo.of() instead of builder
2 parents 53e87fe + 90897f3 commit a26bd59

File tree

6 files changed

+44
-83
lines changed

6 files changed

+44
-83
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ public ZoneInfo build() {
185185
}
186186

187187
/**
188-
* Returns a builder for {@code ZoneInfo} with an assigned {@code name}.
188+
* Returns a ZoneInfo object with assigned {@code name}, {@code dnsName} and {@code description}.
189189
*/
190-
public static Builder builder(String name) {
191-
return new BuilderImpl(name);
190+
public static ZoneInfo of(String name, String dnsName, String description) {
191+
return new BuilderImpl(name).dnsName(dnsName).description(description).build();
192192
}
193193

194194
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ public class DnsImplTest {
4444
// Dns entities
4545
private static final String ZONE_NAME = "some zone name";
4646
private static final String DNS_NAME = "example.com.";
47+
private static final String DESCRIPTION = "desc";
4748
private static final String CHANGE_ID = "some change id";
4849
private static final DnsRecord DNS_RECORD1 = DnsRecord.builder("Something", DnsRecord.Type.AAAA)
4950
.build();
5051
private static final DnsRecord DNS_RECORD2 = DnsRecord.builder("Different", DnsRecord.Type.AAAA)
5152
.build();
5253
private static final Integer MAX_SIZE = 20;
5354
private static final String PAGE_TOKEN = "some token";
54-
private static final ZoneInfo ZONE_INFO = ZoneInfo.builder(ZONE_NAME).build();
55+
private static final ZoneInfo ZONE_INFO = ZoneInfo.of(ZONE_NAME, DNS_NAME, DESCRIPTION);
5556
private static final ProjectInfo PROJECT_INFO = ProjectInfo.builder().build();
5657
private static final ChangeRequest CHANGE_REQUEST_PARTIAL = ChangeRequest.builder()
5758
.add(DNS_RECORD1)

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@
3535

3636
public class SerializationTest {
3737

38-
private static final ZoneInfo FULL_ZONE_INFO = Zone.builder("some zone name")
38+
private static final ZoneInfo FULL_ZONE_INFO = Zone.of("some zone name", "www.example.com",
39+
"some descriptions").toBuilder()
3940
.creationTimeMillis(132L)
40-
.description("some descriptions")
41-
.dnsName("www.example.com")
4241
.id("123333")
4342
.nameServers(ImmutableList.of("server 1", "server 2"))
4443
.nameServerSet("specificationstring")
4544
.build();
46-
private static final ZoneInfo PARTIAL_ZONE_INFO = Zone.builder("some zone name")
47-
.build();
45+
private static final ZoneInfo PARTIAL_ZONE_INFO = Zone.of("some zone name", "www.example.com",
46+
"some descriptions").toBuilder().build();
4847
private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder().id("13").build();
4948
private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.builder()
5049
.id("342")
@@ -87,7 +86,6 @@ public class SerializationTest {
8786
.startTimeMillis(132L)
8887
.build();
8988

90-
9189
@Test
9290
public void testModelAndRequests() throws Exception {
9391
Serializable[] objects = {FULL_ZONE_INFO, PARTIAL_ZONE_INFO, ZONE_LIST_OPTION,

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

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,23 @@ public class ZoneInfoTest {
4141
private static final String NS2 = "name server 2";
4242
private static final String NS3 = "name server 3";
4343
private static final List<String> NAME_SERVERS = ImmutableList.of(NS1, NS2, NS3);
44-
private static final ZoneInfo INFO = ZoneInfo.builder(NAME)
44+
private static final ZoneInfo INFO = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder()
4545
.creationTimeMillis(CREATION_TIME_MILLIS)
4646
.id(ID)
47-
.dnsName(DNS_NAME)
48-
.description(DESCRIPTION)
4947
.nameServerSet(NAME_SERVER_SET)
5048
.nameServers(NAME_SERVERS)
5149
.build();
5250

5351
@Test
54-
public void testDefaultBuilders() {
55-
ZoneInfo zone = ZoneInfo.builder(NAME).build();
56-
assertTrue(zone.nameServers().isEmpty());
57-
assertEquals(NAME, zone.name());
58-
assertNull(zone.id());
59-
assertNull(zone.creationTimeMillis());
60-
assertNull(zone.nameServerSet());
61-
assertNull(zone.description());
62-
assertNull(zone.dnsName());
52+
public void testOf() {
53+
ZoneInfo partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION);
54+
assertTrue(partial.nameServers().isEmpty());
55+
assertEquals(NAME, partial.name());
56+
assertNull(partial.id());
57+
assertNull(partial.creationTimeMillis());
58+
assertNull(partial.nameServerSet());
59+
assertEquals(DESCRIPTION, partial.description());
60+
assertEquals(DNS_NAME, partial.dnsName());
6361
}
6462

6563
@Test
@@ -109,42 +107,38 @@ public void testSameHashCodeOnEquals() {
109107
@Test
110108
public void testToBuilder() {
111109
assertEquals(INFO, INFO.toBuilder().build());
112-
ZoneInfo partial = ZoneInfo.builder(NAME).build();
110+
ZoneInfo partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION);
113111
assertEquals(partial, partial.toBuilder().build());
114-
partial = ZoneInfo.builder(NAME).id(ID).build();
112+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().id(ID).build();
115113
assertEquals(partial, partial.toBuilder().build());
116-
partial = ZoneInfo.builder(NAME).description(DESCRIPTION).build();
117-
assertEquals(partial, partial.toBuilder().build());
118-
partial = ZoneInfo.builder(NAME).dnsName(DNS_NAME).build();
119-
assertEquals(partial, partial.toBuilder().build());
120-
partial = ZoneInfo.builder(NAME).creationTimeMillis(CREATION_TIME_MILLIS).build();
114+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder()
115+
.creationTimeMillis(CREATION_TIME_MILLIS).build();
121116
assertEquals(partial, partial.toBuilder().build());
122117
List<String> nameServers = new LinkedList<>();
123118
nameServers.add(NS1);
124-
partial = ZoneInfo.builder(NAME).nameServers(nameServers).build();
119+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().nameServers(nameServers).build();
125120
assertEquals(partial, partial.toBuilder().build());
126-
partial = ZoneInfo.builder(NAME).nameServerSet(NAME_SERVER_SET).build();
121+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().nameServerSet(NAME_SERVER_SET)
122+
.build();
127123
assertEquals(partial, partial.toBuilder().build());
128124
}
129125

130126
@Test
131127
public void testToAndFromPb() {
132128
assertEquals(INFO, ZoneInfo.fromPb(INFO.toPb()));
133-
ZoneInfo partial = ZoneInfo.builder(NAME).build();
134-
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
135-
partial = ZoneInfo.builder(NAME).id(ID).build();
136-
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
137-
partial = ZoneInfo.builder(NAME).description(DESCRIPTION).build();
129+
ZoneInfo partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION);
138130
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
139-
partial = ZoneInfo.builder(NAME).dnsName(DNS_NAME).build();
131+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().id(ID).build();
140132
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
141-
partial = ZoneInfo.builder(NAME).creationTimeMillis(CREATION_TIME_MILLIS).build();
133+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder()
134+
.creationTimeMillis(CREATION_TIME_MILLIS).build();
142135
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
143136
List<String> nameServers = new LinkedList<>();
144137
nameServers.add(NS1);
145-
partial = ZoneInfo.builder(NAME).nameServers(nameServers).build();
138+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().nameServers(nameServers).build();
146139
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
147-
partial = ZoneInfo.builder(NAME).nameServerSet(NAME_SERVER_SET).build();
140+
partial = ZoneInfo.of(NAME, DNS_NAME, DESCRIPTION).toBuilder().nameServerSet(NAME_SERVER_SET)
141+
.build();
148142
assertEquals(partial, ZoneInfo.fromPb(partial.toPb()));
149143
}
150144

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public class ZoneTest {
4343

4444
private static final String ZONE_NAME = "dns-zone-name";
4545
private static final String ZONE_ID = "123";
46-
private static final ZoneInfo ZONE_INFO = Zone.builder(ZONE_NAME)
46+
private static final ZoneInfo ZONE_INFO = Zone.of(ZONE_NAME, "example.com", "description")
47+
.toBuilder()
4748
.id(ZONE_ID)
48-
.dnsName("example.com")
4949
.creationTimeMillis(123478946464L)
5050
.build();
51-
private static final ZoneInfo NO_ID_INFO = ZoneInfo.builder(ZONE_NAME)
52-
.dnsName("another-example.com")
51+
private static final ZoneInfo NO_ID_INFO =
52+
ZoneInfo.of(ZONE_NAME, "another-example.com", "description").toBuilder()
5353
.creationTimeMillis(893123464L)
5454
.build();
5555
private static final Dns.ZoneOption ZONE_FIELD_OPTIONS =
@@ -71,7 +71,6 @@ public class ZoneTest {
7171
private Zone zone;
7272
private Zone zoneNoId;
7373

74-
7574
@Before
7675
public void setUp() throws Exception {
7776
dns = createStrictMock(Dns.class);

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

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,14 @@ public class ITDnsTest {
6060
private static final String ZONE_DNS_NAME1 = ZONE_NAME1 + ".com.";
6161
private static final String ZONE_DNS_EMPTY_DESCRIPTION = ZONE_NAME_EMPTY_DESCRIPTION + ".com.";
6262
private static final String ZONE_DNS_NAME_NO_PERIOD = ZONE_NAME1 + ".com";
63-
private static final ZoneInfo ZONE1 = ZoneInfo.builder(ZONE_NAME1)
64-
.description(ZONE_DESCRIPTION1)
65-
.dnsName(ZONE_DNS_EMPTY_DESCRIPTION)
66-
.build();
63+
private static final ZoneInfo ZONE1 =
64+
ZoneInfo.of(ZONE_NAME1, ZONE_DNS_EMPTY_DESCRIPTION, ZONE_DESCRIPTION1);
6765
private static final ZoneInfo ZONE_EMPTY_DESCRIPTION =
68-
ZoneInfo.builder(ZONE_NAME_EMPTY_DESCRIPTION)
69-
.description(ZONE_DESCRIPTION1)
70-
.dnsName(ZONE_DNS_NAME1)
71-
.build();
72-
private static final ZoneInfo ZONE_NAME_ERROR = ZoneInfo.builder(ZONE_NAME_TOO_LONG)
73-
.description(ZONE_DESCRIPTION1)
74-
.dnsName(ZONE_DNS_NAME1)
75-
.build();
76-
private static final ZoneInfo ZONE_MISSING_DESCRIPTION = ZoneInfo.builder(ZONE_NAME1)
77-
.dnsName(ZONE_DNS_NAME1)
78-
.build();
79-
private static final ZoneInfo ZONE_MISSING_DNS_NAME = ZoneInfo.builder(ZONE_NAME1)
80-
.description(ZONE_DESCRIPTION1)
81-
.build();
82-
private static final ZoneInfo ZONE_DNS_NO_PERIOD = ZoneInfo.builder(ZONE_NAME1)
83-
.description(ZONE_DESCRIPTION1)
84-
.dnsName(ZONE_DNS_NAME_NO_PERIOD)
85-
.build();
66+
ZoneInfo.of(ZONE_NAME_EMPTY_DESCRIPTION, ZONE_DNS_NAME1, ZONE_DESCRIPTION1);
67+
private static final ZoneInfo ZONE_NAME_ERROR =
68+
ZoneInfo.of(ZONE_NAME_TOO_LONG, ZONE_DNS_NAME1, ZONE_DESCRIPTION1);
69+
private static final ZoneInfo ZONE_DNS_NO_PERIOD =
70+
ZoneInfo.of(ZONE_NAME1, ZONE_DNS_NAME_NO_PERIOD, ZONE_DESCRIPTION1);
8671
private static final DnsRecord A_RECORD_ZONE1 =
8772
DnsRecord.builder("www." + ZONE1.dnsName(), DnsRecord.Type.A)
8873
.records(ImmutableList.of("123.123.55.1"))
@@ -211,20 +196,6 @@ public void testCreateValidZone() {
211196
@Test
212197
public void testCreateZoneWithErrors() {
213198
try {
214-
try {
215-
DNS.create(ZONE_MISSING_DNS_NAME);
216-
fail("Zone is missing DNS name. The service returns an error.");
217-
} catch (DnsException ex) {
218-
// expected
219-
// todo(mderka) test non-retryable when implemented within #593
220-
}
221-
try {
222-
DNS.create(ZONE_MISSING_DESCRIPTION);
223-
fail("Zone is missing description name. The service returns an error.");
224-
} catch (DnsException ex) {
225-
// expected
226-
// todo(mderka) test non-retryable when implemented within #593
227-
}
228199
try {
229200
DNS.create(ZONE_NAME_ERROR);
230201
fail("Zone name is missing a period. The service returns an error.");
@@ -240,8 +211,6 @@ public void testCreateZoneWithErrors() {
240211
// todo(mderka) test non-retryable when implemented within #593
241212
}
242213
} finally {
243-
DNS.delete(ZONE_MISSING_DNS_NAME.name());
244-
DNS.delete(ZONE_MISSING_DESCRIPTION.name());
245214
DNS.delete(ZONE_NAME_ERROR.name());
246215
DNS.delete(ZONE_DNS_NO_PERIOD.name());
247216
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy