Skip to content

Commit 4e697de

Browse files
mderkamderka
committed
---
yaml --- r: 4589 b: refs/heads/logging-alpha c: 96e380c h: refs/heads/master i: 4587: 7597618
1 parent f7b2db5 commit 4e697de

12 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
1212
refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
1313
refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
1414
refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
15-
refs/heads/logging-alpha: f5c058714513f07b89a9971147aaa95fb1674e3d
15+
refs/heads/logging-alpha: 96e380c182aa89f8c4f7dbdcb7df2d4c188c8343
1616
refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
1717
refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
1818
refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f

‎branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/AbstractOption.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import com.google.common.base.MoreObjects;
22-
import com.google.gcloud.spi.DnsRpc;
22+
import com.google.gcloud.dns.spi.DnsRpc;
2323

2424
import java.io.Serializable;
2525
import java.util.Objects;

‎branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Dns.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.common.collect.Sets;
2121
import com.google.gcloud.Page;
2222
import com.google.gcloud.Service;
23-
import com.google.gcloud.spi.DnsRpc;
23+
import com.google.gcloud.dns.spi.DnsRpc;
2424

2525
import java.io.Serializable;
2626
import java.util.Set;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.google.gcloud.Page;
3434
import com.google.gcloud.PageImpl;
3535
import com.google.gcloud.RetryHelper;
36-
import com.google.gcloud.spi.DnsRpc;
36+
import com.google.gcloud.dns.spi.DnsRpc;
3737

3838
import java.util.Map;
3939
import java.util.concurrent.Callable;

‎branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsOptions.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import com.google.common.collect.ImmutableSet;
2020
import com.google.gcloud.ServiceOptions;
21-
import com.google.gcloud.spi.DefaultDnsRpc;
22-
import com.google.gcloud.spi.DnsRpc;
23-
import com.google.gcloud.spi.DnsRpcFactory;
21+
import com.google.gcloud.dns.spi.DefaultDnsRpc;
22+
import com.google.gcloud.dns.spi.DnsRpc;
23+
import com.google.gcloud.dns.spi.DnsRpcFactory;
2424

2525
import java.util.Set;
2626

branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java renamed to branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/spi/DefaultDnsRpc.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.google.gcloud.spi;
2-
3-
import static com.google.gcloud.spi.DnsRpc.ListResult.of;
4-
import static com.google.gcloud.spi.DnsRpc.Option.DNS_NAME;
5-
import static com.google.gcloud.spi.DnsRpc.Option.DNS_TYPE;
6-
import static com.google.gcloud.spi.DnsRpc.Option.FIELDS;
7-
import static com.google.gcloud.spi.DnsRpc.Option.NAME;
8-
import static com.google.gcloud.spi.DnsRpc.Option.PAGE_SIZE;
9-
import static com.google.gcloud.spi.DnsRpc.Option.PAGE_TOKEN;
10-
import static com.google.gcloud.spi.DnsRpc.Option.SORTING_ORDER;
1+
package com.google.gcloud.dns.spi;
2+
3+
import static com.google.gcloud.dns.spi.DnsRpc.ListResult.of;
4+
import static com.google.gcloud.dns.spi.DnsRpc.Option.DNS_NAME;
5+
import static com.google.gcloud.dns.spi.DnsRpc.Option.DNS_TYPE;
6+
import static com.google.gcloud.dns.spi.DnsRpc.Option.FIELDS;
7+
import static com.google.gcloud.dns.spi.DnsRpc.Option.NAME;
8+
import static com.google.gcloud.dns.spi.DnsRpc.Option.PAGE_SIZE;
9+
import static com.google.gcloud.dns.spi.DnsRpc.Option.PAGE_TOKEN;
10+
import static com.google.gcloud.dns.spi.DnsRpc.Option.SORTING_ORDER;
1111
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
1212

1313
import com.google.api.client.http.HttpRequestInitializer;
@@ -188,7 +188,7 @@ public ListResult<Change> listChangeRequests(String zoneName, Map<Option, ?> opt
188188
request = request.setSortBy(SORT_BY).setSortOrder(SORTING_ORDER.getString(options));
189189
}
190190
ChangesListResponse response = request.execute();
191-
return ListResult.of(response.getNextPageToken(), response.getChanges());
191+
return of(response.getNextPageToken(), response.getChanges());
192192
} catch (IOException ex) {
193193
throw translate(ex);
194194
}

branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DnsRpc.java renamed to branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/spi/DnsRpc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.spi;
17+
package com.google.gcloud.dns.spi;
1818

1919
import com.google.api.services.dns.model.Change;
2020
import com.google.api.services.dns.model.ManagedZone;

branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DnsRpcFactory.java renamed to branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/spi/DnsRpcFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.spi;
17+
package com.google.gcloud.dns.spi;
1818

1919
import com.google.gcloud.dns.DnsOptions;
20+
import com.google.gcloud.spi.ServiceRpcFactory;
2021

2122
/**
2223
* An interface for DnsRpc factory. Implementation will be loaded via {@link

‎branches/logging-alpha/gcloud-java-dns/src/test/java/com/google/gcloud/dns/AbstractOptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.junit.Assert.assertNotEquals;
2121
import static org.junit.Assert.fail;
2222

23-
import com.google.gcloud.spi.DnsRpc;
23+
import com.google.gcloud.dns.spi.DnsRpc;
2424

2525
import org.junit.Test;
2626

‎branches/logging-alpha/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
@@ -28,8 +28,8 @@
2828
import com.google.gcloud.Page;
2929
import com.google.gcloud.RetryParams;
3030
import com.google.gcloud.ServiceOptions;
31-
import com.google.gcloud.spi.DnsRpc;
32-
import com.google.gcloud.spi.DnsRpcFactory;
31+
import com.google.gcloud.dns.spi.DnsRpc;
32+
import com.google.gcloud.dns.spi.DnsRpcFactory;
3333

3434
import org.easymock.Capture;
3535
import org.easymock.EasyMock;

0 commit comments

Comments
 (0)