Skip to content

Commit b377d44

Browse files
dzlierdzlier
committed
Fix build errors caused by dependency updates.
1 parent c881816 commit b377d44

File tree

8 files changed

+130
-40
lines changed

8 files changed

+130
-40
lines changed

‎.kokoro/presubmit.cfg‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
2020
value: "github/java-docs-samples/.kokoro/tests/diff_tests.sh"
2121
}
22-

‎appengine/datastore/pom.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,93 @@
4141
<module>indexes-perfect</module>
4242
</modules>
4343

44+
<dependencies>
45+
<dependency>
46+
<groupId>com.google.auto.value</groupId>
47+
<artifactId>auto-value</artifactId>
48+
<version>1.5.3</version>
49+
<scope>provided</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.google.code.findbugs</groupId>
53+
<artifactId>jsr305</artifactId> <!-- @Nullable annotations -->
54+
<version>3.0.2</version>
55+
</dependency>
56+
57+
<dependency>
58+
<groupId>com.google.guava</groupId>
59+
<artifactId>guava</artifactId>
60+
<version>20.0</version>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>joda-time</groupId>
65+
<artifactId>joda-time</artifactId>
66+
<version>2.9.9</version>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>javax.servlet</groupId>
71+
<artifactId>servlet-api</artifactId>
72+
<version>2.5</version>
73+
<scope>provided</scope>
74+
</dependency>
75+
76+
<dependency>
77+
<groupId>com.google.appengine</groupId>
78+
<artifactId>appengine-api-1.0-sdk</artifactId>
79+
<version>1.9.63</version>
80+
</dependency>
81+
82+
<!-- Test Dependencies -->
83+
<dependency>
84+
<groupId>junit</groupId>
85+
<artifactId>junit</artifactId>
86+
<version>4.12</version>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.mockito</groupId>
91+
<artifactId>mockito-all</artifactId>
92+
<version>1.10.19</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.google.appengine</groupId>
97+
<artifactId>appengine-testing</artifactId>
98+
<version>1.9.59</version>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>com.google.appengine</groupId>
103+
<artifactId>appengine-api-stubs</artifactId>
104+
<version>1.9.59</version>
105+
<scope>test</scope>
106+
</dependency>
107+
<dependency>
108+
<groupId>com.google.appengine</groupId>
109+
<artifactId>appengine-tools-sdk</artifactId>
110+
<version>1.9.59</version>
111+
<scope>test</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>com.google.truth</groupId>
115+
<artifactId>truth</artifactId>
116+
<version>0.37</version>
117+
<scope>test</scope>
118+
</dependency>
119+
</dependencies>
120+
121+
<build>
122+
<!-- for hot reload of the web application -->
123+
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
124+
<plugins>
125+
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
126+
<plugin>
127+
<groupId>com.google.appengine</groupId>
128+
<artifactId>appengine-maven-plugin</artifactId>
129+
<version>1.9.59</version>
130+
</plugin>
131+
</plugins>
132+
</build>
44133
</project>

‎container-registry/container-analysis/src/main/java/com/example/containeranalysis/Samples.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import com.google.containeranalysis.v1alpha1.Occurrence;
3131
import com.google.containeranalysis.v1alpha1.VulnerabilityType;
3232
import com.google.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityDetails;
33+
import com.google.pubsub.v1.ProjectSubscriptionName;
34+
import com.google.pubsub.v1.ProjectTopicName;
3335
import com.google.pubsub.v1.PubsubMessage;
3436
import com.google.pubsub.v1.PushConfig;
3537
import com.google.pubsub.v1.Subscription;
36-
import com.google.pubsub.v1.SubscriptionName;
37-
import com.google.pubsub.v1.TopicName;
3838

3939
/**
4040
* API usage samples
@@ -292,7 +292,7 @@ public static int pubSub(String subscriptionId, int timeout, String projectId) t
292292

293293
try {
294294
// subscribe to the requested pubsub channel
295-
SubscriptionName subscriptionName = SubscriptionName.of(projectId, subscriptionId);
295+
ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(projectId, subscriptionId);
296296
subscriber = Subscriber.newBuilder(subscriptionName, receiver).build();
297297
subscriber.startAsync().awaitRunning();
298298
// listen to messages for 'listenTimeout' seconds
@@ -339,8 +339,8 @@ public static Subscription createOccurrenceSubscription(String subscriptionId, S
339339
String topicId = "resource-notes-occurrences-v1alpha1";
340340
try (SubscriptionAdminClient client = SubscriptionAdminClient.create()) {
341341
PushConfig config = PushConfig.getDefaultInstance();
342-
TopicName topicName = TopicName.of(projectId, topicId);
343-
SubscriptionName subscriptionName = SubscriptionName.of(projectId, subscriptionId);
342+
ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
343+
ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(projectId, subscriptionId);
344344
Subscription sub = client.createSubscription(subscriptionName, topicName, config, 0);
345345
return sub;
346346
}

‎container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.containeranalysis.v1alpha1.Note;
2626
import com.google.containeranalysis.v1alpha1.Occurrence;
2727
import com.google.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityDetails;
28-
import com.google.pubsub.v1.SubscriptionName;
28+
import com.google.pubsub.v1.ProjectSubscriptionName;
2929
import java.util.Date;
3030
import org.junit.After;
3131
import org.junit.Before;
@@ -194,7 +194,7 @@ public void testPubSub() throws Exception {
194194
int newCount;
195195
int tries;
196196
String subscriptionId = "drydockOccurrences";
197-
SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId);
197+
ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(PROJECT_ID, subscriptionId);
198198

199199
Samples.createOccurrenceSubscription(subscriptionId, PROJECT_ID);
200200
Subscriber subscriber = null;

‎dataflow/spanner-io/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
<groupId>com.google.api.grpc</groupId>
8080
<artifactId>grpc-google-common-protos</artifactId>
8181
</exclusion>
82+
<exclusion>
83+
<groupId>io.grpc</groupId>
84+
<artifactId>grpc-core</artifactId>
85+
</exclusion>
8286
</exclusions>
8387
</dependency>
8488

‎errorreporting/src/main/java/com/example/errorreporting/QuickStart.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception {
3838

3939
// Google Cloud Platform Project ID
4040
String projectId = (args.length > 0) ? args[0] : ServiceOptions.getDefaultProjectId();
41-
ProjectName projectName = ProjectName.create(projectId);
41+
ProjectName projectName = ProjectName.of(projectId);
4242

4343
// Instantiate an Error Reporting Client
4444
try (ReportErrorsServiceClient reportErrorsServiceClient = ReportErrorsServiceClient.create()) {

‎monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void main(String... args) throws Exception {
6565
List<Point> pointList = new ArrayList<>();
6666
pointList.add(point);
6767

68-
ProjectName name = ProjectName.create(projectId);
68+
ProjectName name = ProjectName.of(projectId);
6969

7070
// Prepares the metric descriptor
7171
Map<String, String> metricLabels = new HashMap<String, String>();
@@ -93,7 +93,7 @@ public static void main(String... args) throws Exception {
9393
timeSeriesList.add(timeSeries);
9494

9595
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
96-
.setNameWithProjectName(name)
96+
.setName(name.toString())
9797
.addAllTimeSeries(timeSeriesList)
9898
.build();
9999

‎monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import com.google.api.MonitoredResource;
2222
import com.google.api.MonitoredResourceDescriptor;
2323
import com.google.cloud.monitoring.v3.MetricServiceClient;
24-
import com.google.cloud.monitoring.v3.PagedResponseWrappers;
24+
import com.google.cloud.monitoring.v3.MetricServiceClient.ListMetricDescriptorsPagedResponse;
25+
import com.google.cloud.monitoring.v3.MetricServiceClient.ListMonitoredResourceDescriptorsPagedResponse;
26+
import com.google.cloud.monitoring.v3.MetricServiceClient.ListTimeSeriesPagedResponse;
2527
import com.google.monitoring.v3.Aggregation;
2628
import com.google.monitoring.v3.CreateMetricDescriptorRequest;
2729
import com.google.monitoring.v3.CreateTimeSeriesRequest;
@@ -92,7 +94,7 @@ void createMetricDescriptor(String type) throws IOException {
9294
String metricType = CUSTOM_METRIC_DOMAIN + "/" + type;
9395

9496
final MetricServiceClient client = MetricServiceClient.create();
95-
ProjectName name = ProjectName.create(projectId);
97+
ProjectName name = ProjectName.of(projectId);
9698

9799
MetricDescriptor descriptor = MetricDescriptor.newBuilder()
98100
.setType(metricType)
@@ -102,7 +104,7 @@ void createMetricDescriptor(String type) throws IOException {
102104
.build();
103105

104106
CreateMetricDescriptorRequest request = CreateMetricDescriptorRequest.newBuilder()
105-
.setNameWithProjectName(name)
107+
.setName(name.toString())
106108
.setMetricDescriptor(descriptor)
107109
.build();
108110

@@ -119,7 +121,7 @@ void deleteMetricDescriptor(String name) throws IOException {
119121
// [START monitoring_delete_metric]
120122
String projectId = System.getProperty("projectId");
121123
final MetricServiceClient client = MetricServiceClient.create();
122-
MetricDescriptorName metricName = MetricDescriptorName.create(projectId, name);
124+
MetricDescriptorName metricName = MetricDescriptorName.of(projectId, name);
123125
client.deleteMetricDescriptor(metricName);
124126
System.out.println("Deleted descriptor " + name);
125127
// [END monitoring_delete_metric]
@@ -155,7 +157,7 @@ void writeTimeSeries() throws IOException {
155157
List<Point> pointList = new ArrayList<>();
156158
pointList.add(point);
157159

158-
ProjectName name = ProjectName.create(projectId);
160+
ProjectName name = ProjectName.of(projectId);
159161

160162
// Prepares the metric descriptor
161163
Map<String, String> metricLabels = new HashMap<String, String>();
@@ -185,7 +187,7 @@ void writeTimeSeries() throws IOException {
185187
timeSeriesList.add(timeSeries);
186188

187189
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
188-
.setNameWithProjectName(name)
190+
.setName(name.toString())
189191
.addAllTimeSeries(timeSeriesList)
190192
.build();
191193

@@ -203,7 +205,7 @@ void listTimeSeriesHeaders() throws IOException {
203205
// [START monitoring_read_timeseries_fields]
204206
MetricServiceClient metricServiceClient = MetricServiceClient.create();
205207
String projectId = System.getProperty("projectId");
206-
ProjectName name = ProjectName.create(projectId);
208+
ProjectName name = ProjectName.of(projectId);
207209

208210
// Restrict time to last 20 minutes
209211
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -213,15 +215,14 @@ void listTimeSeriesHeaders() throws IOException {
213215
.build();
214216

215217
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
216-
.setNameWithProjectName(name)
218+
.setName(name.toString())
217219
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
218220
.setInterval(interval)
219221
.setView(ListTimeSeriesRequest.TimeSeriesView.HEADERS);
220222

221223
ListTimeSeriesRequest request = requestBuilder.build();
222224

223-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
224-
.listTimeSeries(request);
225+
ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
225226

226227
System.out.println("Got timeseries headers: ");
227228
for (TimeSeries ts : response.iterateAll()) {
@@ -237,7 +238,7 @@ void listTimeSeries(String filter) throws IOException {
237238
// [START monitoring_read_timeseries_simple]
238239
MetricServiceClient metricServiceClient = MetricServiceClient.create();
239240
String projectId = System.getProperty("projectId");
240-
ProjectName name = ProjectName.create(projectId);
241+
ProjectName name = ProjectName.of(projectId);
241242

242243
// Restrict time to last 20 minutes
243244
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -247,14 +248,13 @@ void listTimeSeries(String filter) throws IOException {
247248
.build();
248249

249250
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
250-
.setNameWithProjectName(name)
251+
.setName(name.toString())
251252
.setFilter(filter)
252253
.setInterval(interval);
253254

254255
ListTimeSeriesRequest request = requestBuilder.build();
255256

256-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
257-
.listTimeSeries(request);
257+
ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
258258

259259
System.out.println("Got timeseries: ");
260260
for (TimeSeries ts : response.iterateAll()) {
@@ -270,7 +270,7 @@ void listTimeSeriesAggregrate() throws IOException {
270270
// [START monitoring_read_timeseries_align]
271271
MetricServiceClient metricServiceClient = MetricServiceClient.create();
272272
String projectId = System.getProperty("projectId");
273-
ProjectName name = ProjectName.create(projectId);
273+
ProjectName name = ProjectName.of(projectId);
274274

275275
// Restrict time to last 20 minutes
276276
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -285,14 +285,14 @@ void listTimeSeriesAggregrate() throws IOException {
285285
.build();
286286

287287
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
288-
.setNameWithProjectName(name)
288+
.setName(name.toString())
289289
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
290290
.setInterval(interval)
291291
.setAggregation(aggregation);
292292

293293
ListTimeSeriesRequest request = requestBuilder.build();
294294

295-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
295+
ListTimeSeriesPagedResponse response = metricServiceClient
296296
.listTimeSeries(request);
297297

298298
System.out.println("Got timeseries: ");
@@ -309,7 +309,7 @@ void listTimeSeriesReduce() throws IOException {
309309
// [START monitoring_read_timeseries_reduce]
310310
MetricServiceClient metricServiceClient = MetricServiceClient.create();
311311
String projectId = System.getProperty("projectId");
312-
ProjectName name = ProjectName.create(projectId);
312+
ProjectName name = ProjectName.of(projectId);
313313

314314
// Restrict time to last 20 minutes
315315
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -325,14 +325,14 @@ void listTimeSeriesReduce() throws IOException {
325325
.build();
326326

327327
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
328-
.setNameWithProjectName(name)
328+
.setName(name.toString())
329329
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
330330
.setInterval(interval)
331331
.setAggregation(aggregation);
332332

333333
ListTimeSeriesRequest request = requestBuilder.build();
334334

335-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
335+
ListTimeSeriesPagedResponse response = metricServiceClient
336336
.listTimeSeries(request);
337337

338338
System.out.println("Got timeseries: ");
@@ -351,14 +351,13 @@ void listMetricDescriptors() throws IOException {
351351
String projectId = System.getProperty("projectId");
352352

353353
final MetricServiceClient client = MetricServiceClient.create();
354-
ProjectName name = ProjectName.create(projectId);
354+
ProjectName name = ProjectName.of(projectId);
355355

356356
ListMetricDescriptorsRequest request = ListMetricDescriptorsRequest
357357
.newBuilder()
358-
.setNameWithProjectName(name)
358+
.setName(name.toString())
359359
.build();
360-
PagedResponseWrappers.ListMetricDescriptorsPagedResponse response =
361-
client.listMetricDescriptors(request);
360+
ListMetricDescriptorsPagedResponse response = client.listMetricDescriptors(request);
362361

363362
System.out.println("Listing descriptors: ");
364363

@@ -377,17 +376,16 @@ void listMonitoredResources() throws IOException {
377376
String projectId = System.getProperty("projectId");
378377

379378
final MetricServiceClient client = MetricServiceClient.create();
380-
ProjectName name = ProjectName.create(projectId);
379+
ProjectName name = ProjectName.of(projectId);
381380

382381
ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest
383382
.newBuilder()
384-
.setNameWithProjectName(name)
383+
.setName(name.toString())
385384
.build();
386385

387386
System.out.println("Listing monitored resource descriptors: ");
388387

389-
PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse response = client
390-
.listMonitoredResourceDescriptors(request);
388+
ListMonitoredResourceDescriptorsPagedResponse response = client.listMonitoredResourceDescriptors(request);
391389

392390
for (MonitoredResourceDescriptor d : response.iterateAll()) {
393391
System.out.println(d.getType());
@@ -406,7 +404,7 @@ void describeMonitoredResources(String type) throws IOException {
406404
String projectId = System.getProperty("projectId");
407405

408406
final MetricServiceClient client = MetricServiceClient.create();
409-
MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.create(projectId, type);
407+
MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.of(projectId, type);
410408
MonitoredResourceDescriptor response = client.getMonitoredResourceDescriptor(name);
411409

412410
System.out.println("Printing monitored resource descriptor: ");

0 commit comments

Comments
 (0)