Skip to content

Commit eb190d6

Browse files
dmitry-fadmitry-fa
authored
Merge branch 'master' into opencensus
2 parents 2daf043 + 34fbfe3 commit eb190d6

File tree

92 files changed

+570
-308
lines changed

Some content is hidden

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

92 files changed

+570
-308
lines changed

‎appengine-java11/cloudsql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<plugin>
102102
<groupId>org.apache.maven.plugins</groupId>
103103
<artifactId>maven-dependency-plugin</artifactId>
104-
<version>3.1.1</version>
104+
<version>3.1.2</version>
105105
<executions>
106106
<execution>
107107
<id>copy</id>

‎appengine-java11/gaeinfo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Copyright 2019 Google LLC
5959
<dependency>
6060
<groupId>com.squareup.okhttp3</groupId>
6161
<artifactId>okhttp</artifactId>
62-
<version>4.4.0</version>
62+
<version>4.4.1</version>
6363
<scope>provided</scope>
6464
</dependency>
6565

@@ -98,7 +98,7 @@ Copyright 2019 Google LLC
9898
<plugin>
9999
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-dependency-plugin</artifactId>
101-
<version>3.1.1</version>
101+
<version>3.1.2</version>
102102
<executions>
103103
<execution>
104104
<id>copy</id>

‎appengine-java11/guestbook-cloud-firestore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<plugin>
110110
<groupId>org.apache.maven.plugins</groupId>
111111
<artifactId>maven-dependency-plugin</artifactId>
112-
<version>3.1.1</version>
112+
<version>3.1.2</version>
113113
<executions>
114114
<execution>
115115
<id>copy</id>

‎appengine-java11/helloworld-servlet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ limitations under the License.
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-dependency-plugin</artifactId>
83-
<version>3.1.1</version>
83+
<version>3.1.2</version>
8484
<executions>
8585
<execution>
8686
<id>copy</id>

‎appengine-java11/micronaut-helloworld/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,12 @@
175175
<path>
176176
<groupId>io.micronaut</groupId>
177177
<artifactId>micronaut-inject-java</artifactId>
178-
<version>1.3.2</version>
178+
<version>1.3.3</version>
179179
</path>
180180
<path>
181181
<groupId>io.micronaut</groupId>
182182
<artifactId>micronaut-validation</artifactId>
183-
<version>1.3.2</version>
183+
<version>1.3.3</version>
184184
</path>
185185
</annotationProcessorPaths>
186186
</configuration>
@@ -198,12 +198,12 @@
198198
<path>
199199
<groupId>io.micronaut</groupId>
200200
<artifactId>micronaut-inject-java</artifactId>
201-
<version>1.3.2</version>
201+
<version>1.3.3</version>
202202
</path>
203203
<path>
204204
<groupId>io.micronaut</groupId>
205205
<artifactId>micronaut-validation</artifactId>
206-
<version>1.3.2</version>
206+
<version>1.3.3</version>
207207
</path>
208208
</annotationProcessorPaths>
209209
</configuration>

‎appengine-java11/oauth2/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@
5757
<dependency>
5858
<groupId>com.google.oauth-client</groupId>
5959
<artifactId>google-oauth-client</artifactId>
60-
<version>1.30.5</version>
60+
<version>1.30.6</version>
6161
<scope>provided</scope>
6262
</dependency>
6363

6464
<dependency>
6565
<groupId>com.google.oauth-client</groupId>
6666
<artifactId>google-oauth-client-servlet</artifactId>
67-
<version>1.30.5</version>
67+
<version>1.30.6</version>
6868
<scope>provided</scope>
6969
</dependency>
7070

7171
<dependency>
7272
<groupId>com.google.apis</groupId>
7373
<artifactId>google-api-services-oauth2</artifactId>
74-
<version>v2-rev20200213-1.30.8</version>
74+
<version>v2-rev20200213-1.30.9</version>
7575
<scope>provided</scope>
7676
</dependency>
7777
<!-- [END gae_java11_oauth2_dependencies] -->
@@ -114,7 +114,7 @@
114114
<plugin>
115115
<groupId>org.apache.maven.plugins</groupId>
116116
<artifactId>maven-dependency-plugin</artifactId>
117-
<version>3.1.1</version>
117+
<version>3.1.2</version>
118118
<executions>
119119
<execution>
120120
<id>copy</id>

‎appengine-java11/quarkus-helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<surefire-plugin.version>2.22.2</surefire-plugin.version>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<maven.compiler.source>11</maven.compiler.source>
35-
<quarkus.version>1.2.1.Final</quarkus.version>
35+
<quarkus.version>1.3.0.Final</quarkus.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
</properties>
3838

‎appengine-java11/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-dependency-plugin</artifactId>
92-
<version>3.1.1</version>
92+
<version>3.1.2</version>
9393
<executions>
9494
<execution>
9595
<id>copy</id>

‎appengine-java8/analytics/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.apache.httpcomponents</groupId>
5555
<artifactId>httpclient</artifactId>
56-
<version>4.5.11</version>
56+
<version>4.5.12</version>
5757
</dependency>
5858

5959
<dependency>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>3.3.0</version>
90+
<version>3.3.3</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>

‎appengine-java8/bigquery/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-bigquery</artifactId>
55-
<version>1.108.0</version>
55+
<version>1.108.1</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.cloud</groupId>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>org.mockito</groupId>
9696
<artifactId>mockito-core</artifactId>
97-
<version>3.3.0</version>
97+
<version>3.3.3</version>
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>

‎appengine-java8/bigtable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ limitations under the License.
4646
<dependency>
4747
<groupId>com.google.cloud.bigtable</groupId>
4848
<artifactId>bigtable-hbase-1.x</artifactId>
49-
<version>1.13.0</version>
49+
<version>1.14.0</version>
5050
</dependency>
5151

5252
<!-- Compile/runtime dependencies -->

‎appengine-java8/cloudsql-postgres/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@
6666
<dependency>
6767
<groupId>com.google.api-client</groupId>
6868
<artifactId>google-api-client-appengine</artifactId>
69-
<version>1.30.8</version>
69+
<version>1.30.9</version>
7070
</dependency>
7171

7272
<!-- [START gae_java8_postgres_dependencies] -->
7373
<dependency>
7474
<groupId>org.postgresql</groupId>
7575
<artifactId>postgresql</artifactId>
76-
<version>42.2.10</version>
76+
<version>42.2.11</version>
7777
</dependency>
7878

7979
<dependency>

‎appengine-java8/cloudsql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.google.api-client</groupId>
7070
<artifactId>google-api-client-appengine</artifactId>
71-
<version>1.30.8</version>
71+
<version>1.30.9</version>
7272
</dependency>
7373

7474
<!-- [START gae_java8_mysql_dependencies] -->

‎appengine-java8/firebase-tictactoe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.google.api-client</groupId>
7070
<artifactId>google-api-client-appengine</artifactId>
71-
<version>1.30.8</version>
71+
<version>1.30.9</version>
7272
</dependency>
7373

7474

‎appengine-java8/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Copyright 2017 Google Inc.
5656
<dependency>
5757
<groupId>com.squareup.okhttp3</groupId>
5858
<artifactId>okhttp</artifactId>
59-
<version>4.4.0</version>
59+
<version>4.4.1</version>
6060
</dependency>
6161

6262
<dependency>

‎appengine-java8/metadata/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Copyright 2017 Google Inc.
5151
<dependency>
5252
<groupId>com.squareup.okhttp3</groupId>
5353
<artifactId>okhttp</artifactId>
54-
<version>4.4.0</version>
54+
<version>4.4.1</version>
5555
</dependency>
5656

5757
<dependency>

‎appengine-java8/remote-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.apache.httpcomponents</groupId>
4646
<artifactId>httpclient</artifactId>
47-
<version>4.5.11</version>
47+
<version>4.5.12</version>
4848
</dependency>
4949

5050
<dependency>

‎appengine-java8/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-spanner</artifactId>
47-
<version>1.50.0</version>
47+
<version>1.51.0</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

‎appengine-java8/taskqueues-deferred/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.mockito</groupId>
6868
<artifactId>mockito-core</artifactId>
69-
<version>3.3.0</version>
69+
<version>3.3.3</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.appengine</groupId>

‎asset/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>com.google.cloud</groupId>
3737
<artifactId>google-cloud-asset</artifactId>
38-
<version>0.116.0-beta</version>
38+
<version>1.1.0</version>
3939
</dependency>
4040
<!-- [END asset_java_dependencies] -->
4141

‎automl/beta/src/main/java/com/example/automl/GetOperationStatus.java

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*
2+
* Copyright 2020 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.example.automl;
18+
19+
// [START automl_get_operation_status_beta]
20+
import com.google.cloud.automl.v1beta1.AutoMlClient;
21+
import com.google.longrunning.Operation;
22+
23+
import java.io.IOException;
24+
25+
class GetOperationStatus {
26+
27+
static void getOperationStatus() throws IOException {
28+
// TODO(developer): Replace these variables before running the sample.
29+
String operationFullId = "projects/[projectId]/locations/us-central1/operations/[operationId]";
30+
getOperationStatus(operationFullId);
31+
}
32+
33+
// Get the status of an operation
34+
static void getOperationStatus(String operationFullId) throws IOException {
35+
// Initialize client that will be used to send requests. This client only needs to be created
36+
// once, and can be reused for multiple requests. After completing all of your requests, call
37+
// the "close" method on the client to safely clean up any remaining background resources.
38+
try (AutoMlClient client = AutoMlClient.create()) {
39+
// Get the latest state of a long-running operation.
40+
Operation operation = client.getOperationsClient().getOperation(operationFullId);
41+
42+
// Display operation details.
43+
System.out.println("Operation details:");
44+
System.out.format("\tName: %s\n", operation.getName());
45+
System.out.format("\tMetadata Type Url: %s\n", operation.getMetadata().getTypeUrl());
46+
System.out.format("\tDone: %s\n", operation.getDone());
47+
if (operation.hasResponse()) {
48+
System.out.format("\tResponse Type Url: %s\n", operation.getResponse().getTypeUrl());
49+
}
50+
if (operation.hasError()) {
51+
System.out.println("\tResponse:");
52+
System.out.format("\t\tError code: %s\n", operation.getError().getCode());
53+
System.out.format("\t\tError message: %s\n", operation.getError().getMessage());
54+
}
55+
}
56+
}
57+
}
58+
// [END automl_get_operation_status_beta]

‎automl/beta/src/test/java/com/example/automl/BatchPredictTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ public void testBatchPredict() {
7474
BatchPredict.batchPredict(PROJECT_ID, MODEL_ID, inputUri, outputUri);
7575
String got = bout.toString();
7676
assertThat(got)
77-
.contains("The model is either not found or not supported for prediction yet.");
77+
.contains("does not exist");
7878
} catch (IOException | ExecutionException | InterruptedException e) {
7979
assertThat(e.getMessage())
80-
.contains("The model is either not found or not supported for prediction yet.");
80+
.contains("does not exist");
8181
}
8282
}
8383
}

0 commit comments

Comments
 (0)