Skip to content

Commit 7bcff48

Browse files
mderkamderka
committed
Implemented comments by @aozarov.
1 parent c364ff3 commit 7bcff48

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.common.base.MoreObjects;
2323
import com.google.common.collect.ImmutableList;
2424
import com.google.common.collect.Lists;
25+
import com.google.common.primitives.Ints;
2526

2627
import java.io.Serializable;
2728
import java.util.LinkedList;
@@ -187,13 +188,9 @@ public Builder ttl(int duration, TimeUnit unit) {
187188
checkArgument(duration >= 0,
188189
"Duration cannot be negative. The supplied value was %s.", duration);
189190
checkNotNull(unit);
190-
// convert to seconds and check that we are not overflowing int
191-
// we cannot do that because pb does not support it
191+
// we cannot have long because pb does not support it
192192
long converted = unit.toSeconds(duration);
193-
checkArgument(converted <= Integer.MAX_VALUE,
194-
"The duration converted to seconds is out of range of int. The value converts to %s sec.",
195-
converted);
196-
ttl = (int) converted;
193+
ttl = Ints.checkedCast(converted);
197194
return this;
198195
}
199196

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static class Quota {
5050
private final int resourceRecordsPerRrset;
5151
private final int rrsetAdditionsPerChange;
5252
private final int rrsetDeletionsPerChange;
53-
private final int rrsetsPerManagedZone;
53+
private final int rrsetsPerZone;
5454
private final int totalRrdataSizePerChange;
5555

5656
/**
@@ -64,13 +64,13 @@ public static class Quota {
6464
int resourceRecordsPerRrset,
6565
int rrsetAdditionsPerChange,
6666
int rrsetDeletionsPerChange,
67-
int rrsetsPerManagedZone,
67+
int rrsetsPerZone,
6868
int totalRrdataSizePerChange) {
6969
this.zones = zones;
7070
this.resourceRecordsPerRrset = resourceRecordsPerRrset;
7171
this.rrsetAdditionsPerChange = rrsetAdditionsPerChange;
7272
this.rrsetDeletionsPerChange = rrsetDeletionsPerChange;
73-
this.rrsetsPerManagedZone = rrsetsPerManagedZone;
73+
this.rrsetsPerZone = rrsetsPerZone;
7474
this.totalRrdataSizePerChange = totalRrdataSizePerChange;
7575
}
7676

@@ -107,8 +107,8 @@ public int rrsetDeletionsPerChange() {
107107
* Returns the maximum allowed number of {@link DnsRecord}s per {@link ZoneInfo} in the
108108
* project.
109109
*/
110-
public int rrsetsPerManagedZone() {
111-
return rrsetsPerManagedZone;
110+
public int rrsetsPerZone() {
111+
return rrsetsPerZone;
112112
}
113113

114114
/**
@@ -126,7 +126,7 @@ public boolean equals(Object other) {
126126
@Override
127127
public int hashCode() {
128128
return Objects.hash(zones, resourceRecordsPerRrset, rrsetAdditionsPerChange,
129-
rrsetDeletionsPerChange, rrsetsPerManagedZone, totalRrdataSizePerChange);
129+
rrsetDeletionsPerChange, rrsetsPerZone, totalRrdataSizePerChange);
130130
}
131131

132132
com.google.api.services.dns.model.Quota toPb() {
@@ -135,7 +135,7 @@ com.google.api.services.dns.model.Quota toPb() {
135135
pb.setResourceRecordsPerRrset(resourceRecordsPerRrset);
136136
pb.setRrsetAdditionsPerChange(rrsetAdditionsPerChange);
137137
pb.setRrsetDeletionsPerChange(rrsetDeletionsPerChange);
138-
pb.setRrsetsPerManagedZone(rrsetsPerManagedZone);
138+
pb.setRrsetsPerManagedZone(rrsetsPerZone);
139139
pb.setTotalRrdataSizePerChange(totalRrdataSizePerChange);
140140
return pb;
141141
}
@@ -158,7 +158,7 @@ public String toString() {
158158
.add("resourceRecordsPerRrset", resourceRecordsPerRrset)
159159
.add("rrsetAdditionsPerChange", rrsetAdditionsPerChange)
160160
.add("rrsetDeletionsPerChange", rrsetDeletionsPerChange)
161-
.add("rrsetsPerManagedZone", rrsetsPerManagedZone)
161+
.add("rrsetsPerZone", rrsetsPerZone)
162162
.add("totalRrdataSizePerChange", totalRrdataSizePerChange)
163163
.toString();
164164
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public BigInteger id() {
207207
}
208208

209209
/**
210-
* Returns the time when this time that this zone was created on the server.
210+
* Returns the time when this zone was created on the server.
211211
*/
212212
public Long creationTimeMillis() {
213213
return creationTimeMillis;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testQuotaConstructor() {
5757
assertEquals(2, QUOTA.resourceRecordsPerRrset());
5858
assertEquals(3, QUOTA.rrsetAdditionsPerChange());
5959
assertEquals(4, QUOTA.rrsetDeletionsPerChange());
60-
assertEquals(5, QUOTA.rrsetsPerManagedZone());
60+
assertEquals(5, QUOTA.rrsetsPerZone());
6161
assertEquals(6, QUOTA.totalRrdataSizePerChange());
6262
}
6363

@@ -101,11 +101,11 @@ public void testSameHashCodeOnEquals() {
101101
public void testToAndFromPb() {
102102
assertEquals(PROJECT_INFO, ProjectInfo.fromPb(PROJECT_INFO.toPb()));
103103
ProjectInfo partial = ProjectInfo.builder().id(ID).build();
104-
assertEquals(partial, PROJECT_INFO.fromPb(partial.toPb()));
104+
assertEquals(partial, ProjectInfo.fromPb(partial.toPb()));
105105
partial = ProjectInfo.builder().number(NUMBER).build();
106-
assertEquals(partial, PROJECT_INFO.fromPb(partial.toPb()));
106+
assertEquals(partial, ProjectInfo.fromPb(partial.toPb()));
107107
partial = ProjectInfo.builder().quota(QUOTA).build();
108-
assertEquals(partial, PROJECT_INFO.fromPb(partial.toPb()));
108+
assertEquals(partial, ProjectInfo.fromPb(partial.toPb()));
109109
assertNotEquals(PROJECT_INFO, partial);
110110
}
111111

0 commit comments

Comments
 (0)