Skip to content

Commit d476ef7

Browse files
michaelbausormichaelbausor
authored
Changes required for updated api-common (googleapis#1927)
1 parent b6a87b0 commit d476ef7

File tree

72 files changed

+123
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+123
-109
lines changed

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java‎

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

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

21-
import com.google.api.gax.core.ApiClock;
21+
import com.google.api.core.ApiClock;
2222
import com.google.cloud.WaitForOption;
2323
import com.google.cloud.WaitForOption.CheckingPeriod;
2424
import com.google.cloud.WaitForOption.Timeout;

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import static org.junit.Assert.assertSame;
2828
import static org.junit.Assert.assertTrue;
2929

30-
import com.google.api.gax.core.ApiClock;
31-
import com.google.api.gax.core.CurrentMillisClock;
30+
import com.google.api.core.ApiClock;
31+
import com.google.api.core.CurrentMillisClock;
3232
import com.google.cloud.WaitForOption;
3333
import com.google.cloud.bigquery.JobStatistics.CopyStatistics;
3434

‎google-cloud-compute/src/main/java/com/google/cloud/compute/Operation.java‎

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

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

21-
import com.google.api.gax.core.ApiClock;
21+
import com.google.api.core.ApiClock;
2222
import com.google.cloud.WaitForOption;
2323
import com.google.cloud.WaitForOption.CheckingPeriod;
2424
import com.google.cloud.compute.Compute.OperationOption;

‎google-cloud-compute/src/test/java/com/google/cloud/compute/OperationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static org.junit.Assert.assertSame;
2929
import static org.junit.Assert.assertTrue;
3030

31-
import com.google.api.gax.core.ApiClock;
32-
import com.google.api.gax.core.CurrentMillisClock;
31+
import com.google.api.core.ApiClock;
32+
import com.google.api.core.CurrentMillisClock;
3333
import com.google.cloud.WaitForOption;
3434
import com.google.cloud.compute.Operation.OperationError;
3535
import com.google.cloud.compute.Operation.OperationWarning;

‎google-cloud-core/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@
138138
</exclusion>
139139
</exclusions>
140140
</dependency>
141+
<dependency>
142+
<groupId>com.google.api</groupId>
143+
<artifactId>api-common</artifactId>
144+
<version>${api-common.version}</version>
145+
</dependency>
141146
<dependency>
142147
<groupId>com.google.api.grpc</groupId>
143148
<artifactId>grpc-google-common-protos</artifactId>

‎google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.cloud;
1818

19-
import com.google.api.gax.core.ApiFuture;
20-
import com.google.api.gax.core.ApiFutures;
19+
import com.google.api.core.ApiFuture;
20+
import com.google.api.core.ApiFutures;
2121
import com.google.api.gax.core.AsyncPage;
2222
import com.google.api.gax.core.Page;
2323
import com.google.common.base.Throwables;

‎google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud;
1818

19-
import com.google.api.gax.core.ApiClock;
19+
import com.google.api.core.ApiClock;
2020
import com.google.api.gax.core.RetrySettings;
2121

2222
import com.google.api.gax.retrying.DirectRetryingExecutor;

‎google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import static com.google.common.base.Preconditions.checkNotNull;
2222
import static java.nio.charset.StandardCharsets.UTF_8;
2323

24-
import com.google.api.gax.core.ApiClock;
25-
import com.google.api.gax.core.CurrentMillisClock;
24+
import com.google.api.core.ApiClock;
25+
import com.google.api.core.CurrentMillisClock;
2626
import com.google.api.gax.core.PropertiesProvider;
2727
import com.google.api.gax.core.RetrySettings;
2828
import com.google.auth.Credentials;

‎google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java‎

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

1919
import static org.junit.Assert.assertEquals;
2020

21-
import com.google.api.gax.core.ApiFuture;
22-
import com.google.api.gax.core.ApiFutures;
21+
import com.google.api.core.ApiFuture;
22+
import com.google.api.core.ApiFutures;
2323
import com.google.api.gax.core.AsyncPage;
2424
import com.google.common.collect.ImmutableList;
2525

‎google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import static org.junit.Assert.assertTrue;
2323
import static org.junit.Assert.fail;
2424

25-
import com.google.api.gax.core.ApiClock;
26-
import com.google.api.gax.core.CurrentMillisClock;
25+
import com.google.api.core.ApiClock;
26+
import com.google.api.core.CurrentMillisClock;
2727
import com.google.auth.oauth2.GoogleCredentials;
2828
import com.google.cloud.spi.ServiceRpcFactory;
2929
import java.io.ByteArrayInputStream;

0 commit comments

Comments
 (0)