Skip to content

Commit ff65582

Browse files
mderkamderka
committed
Unified imports of model objects.
1 parent c178259 commit ff65582

7 files changed

Lines changed: 23 additions & 18 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.google.api.services.dns.model.Change;
2323
import com.google.api.services.dns.model.ManagedZone;
24+
import com.google.api.services.dns.model.Project;
2425
import com.google.api.services.dns.model.ResourceRecordSet;
2526
import com.google.common.base.Function;
2627
import com.google.common.collect.ImmutableList;
@@ -256,10 +257,10 @@ public Boolean call() {
256257
public ProjectInfo getProject(Dns.ProjectOption... fields) {
257258
final Map<DnsRpc.Option, ?> optionsMap = optionMap(fields);
258259
try {
259-
com.google.api.services.dns.model.Project answer = runWithRetries(
260-
new Callable<com.google.api.services.dns.model.Project>() {
260+
Project answer = runWithRetries(
261+
new Callable<Project>() {
261262
@Override
262-
public com.google.api.services.dns.model.Project call() {
263+
public Project call() {
263264
return dnsRpc.getProject(optionsMap);
264265
}
265266
}, options().retryParams(), EXCEPTION_HANDLER);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.api.client.repackaged.com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.services.dns.model.Project;
2122
import com.google.common.base.MoreObjects;
2223

2324
import java.io.Serializable;
@@ -143,14 +144,13 @@ com.google.api.services.dns.model.Quota toPb() {
143144
}
144145

145146
static Quota fromPb(com.google.api.services.dns.model.Quota pb) {
146-
Quota quota = new Quota(pb.getManagedZones(),
147+
return new Quota(pb.getManagedZones(),
147148
pb.getResourceRecordsPerRrset(),
148149
pb.getRrsetAdditionsPerChange(),
149150
pb.getRrsetDeletionsPerChange(),
150151
pb.getRrsetsPerManagedZone(),
151152
pb.getTotalRrdataSizePerChange()
152153
);
153-
return quota;
154154
}
155155

156156
@Override
@@ -243,8 +243,8 @@ String id() {
243243
return id;
244244
}
245245

246-
com.google.api.services.dns.model.Project toPb() {
247-
com.google.api.services.dns.model.Project pb = new com.google.api.services.dns.model.Project();
246+
Project toPb() {
247+
Project pb = new Project();
248248
pb.setId(id);
249249
pb.setNumber(number);
250250
if (this.quota != null) {
@@ -253,7 +253,7 @@ com.google.api.services.dns.model.Project toPb() {
253253
return pb;
254254
}
255255

256-
static ProjectInfo fromPb(com.google.api.services.dns.model.Project pb) {
256+
static ProjectInfo fromPb(Project pb) {
257257
Builder builder = builder();
258258
if (pb.getId() != null) {
259259
builder.id(pb.getId());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.services.dns.model.ManagedZone;
2122
import com.google.gcloud.Page;
2223

2324
import java.io.IOException;
@@ -210,7 +211,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo
210211
this.dns = options.service();
211212
}
212213

213-
static Zone fromPb(Dns dns, com.google.api.services.dns.model.ManagedZone zone) {
214+
static Zone fromPb(Dns dns, ManagedZone zone) {
214215
ZoneInfo info = ZoneInfo.fromPb(zone);
215216
return new Zone(dns, new ZoneInfo.BuilderImpl(info));
216217
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.services.dns.model.ManagedZone;
2122
import com.google.common.base.MoreObjects;
2223
import com.google.common.collect.ImmutableList;
2324
import com.google.common.collect.Lists;
@@ -248,9 +249,9 @@ public Builder toBuilder() {
248249
return new BuilderImpl(this);
249250
}
250251

251-
com.google.api.services.dns.model.ManagedZone toPb() {
252-
com.google.api.services.dns.model.ManagedZone pb =
253-
new com.google.api.services.dns.model.ManagedZone();
252+
ManagedZone toPb() {
253+
ManagedZone pb =
254+
new ManagedZone();
254255
pb.setDescription(this.description());
255256
pb.setDnsName(this.dnsName());
256257
if (this.generatedId() != null) {
@@ -267,7 +268,7 @@ com.google.api.services.dns.model.ManagedZone toPb() {
267268
return pb;
268269
}
269270

270-
static ZoneInfo fromPb(com.google.api.services.dns.model.ManagedZone pb) {
271+
static ZoneInfo fromPb(ManagedZone pb) {
271272
Builder builder = new BuilderImpl(pb.getName());
272273
if (pb.getDescription() != null) {
273274
builder.description(pb.getDescription());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static org.junit.Assert.assertTrue;
2424
import static org.junit.Assert.fail;
2525

26+
import com.google.api.services.dns.model.Change;
2627
import com.google.common.collect.ImmutableList;
2728

2829
import org.junit.Test;
@@ -209,7 +210,7 @@ public void testRemoveDeletion() {
209210
@Test
210211
public void testDateParsing() {
211212
String startTime = "2016-01-26T18:33:43.512Z"; // obtained from service
212-
com.google.api.services.dns.model.Change change = CHANGE.toPb().setStartTime(startTime);
213+
Change change = CHANGE.toPb().setStartTime(startTime);
213214
ChangeRequestInfo converted = ChangeRequest.fromPb(change);
214215
assertNotNull(converted.startTimeMillis());
215216
assertEquals(change, converted.toPb());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.google.api.services.dns.model.Change;
2323
import com.google.api.services.dns.model.ManagedZone;
24+
import com.google.api.services.dns.model.ResourceRecordSet;
2425
import com.google.common.collect.ImmutableList;
2526
import com.google.common.collect.ImmutableMap;
2627
import com.google.common.collect.Lists;
@@ -69,8 +70,7 @@ public class DnsImplTest {
6970
CHANGE_REQUEST_PARTIAL.toPb()));
7071
private static final DnsRpc.ListResult<ManagedZone> LIST_RESULT_OF_PB_ZONES =
7172
DnsRpc.ListResult.of("cursor", ImmutableList.of(ZONE_INFO.toPb()));
72-
private static final DnsRpc.ListResult<com.google.api.services.dns.model.ResourceRecordSet>
73-
LIST_OF_PB_DNS_RECORDS =
73+
private static final DnsRpc.ListResult<ResourceRecordSet> LIST_OF_PB_DNS_RECORDS =
7474
DnsRpc.ListResult.of("cursor", ImmutableList.of(DNS_RECORD1.toPb(), DNS_RECORD2.toPb()));
7575

7676
// Field options

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.junit.Assert.assertNull;
2222
import static org.junit.Assert.assertTrue;
2323

24+
import com.google.api.services.dns.model.ManagedZone;
2425
import com.google.common.collect.ImmutableList;
2526
import com.google.common.collect.Lists;
2627

@@ -155,10 +156,10 @@ public void testEmptyNameServers() {
155156

156157
@Test
157158
public void testDateParsing() {
158-
com.google.api.services.dns.model.ManagedZone pb = INFO.toPb();
159+
ManagedZone pb = INFO.toPb();
159160
pb.setCreationTime("2016-01-19T18:00:12.854Z"); // a real value obtained from Google Cloud DNS
160161
ZoneInfo mz = ZoneInfo.fromPb(pb); // parses the string timestamp to millis
161-
com.google.api.services.dns.model.ManagedZone pbClone = mz.toPb(); // converts it back to string
162+
ManagedZone pbClone = mz.toPb(); // converts it back to string
162163
assertEquals(pb, pbClone);
163164
assertEquals(pb.getCreationTime(), pbClone.getCreationTime());
164165
}

0 commit comments

Comments
 (0)