8000 merge master · coderatgoogle/java-docs-samples@c612e8e · GitHub
[go: up one dir, main page]
Skip to content

Commit c612e8e

Browse files
elharoelharo
committed
merge master
2 parents eae2bfc + e8aabf4 commit c612e8e

File tree

70 files changed

+398
-135
lines changed

Some content is hidden

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

70 files changed

+398
-135
lines changed

‎appengine-java11/kotlin-ktor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ limitations under the License.
5959
<dependency>
6060
<groupId>io.ktor</groupId>
6161
<artifactId>ktor-bom</artifactId>
62-
<version>1.4.0</version>
62+
<version>1.4.1</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,54 +33,48 @@
3333
<exec.mainClass>com.example.appengine.Application</exec.mainClass>
3434
<maven.compiler.target>11</maven.compiler.target>
3535
<maven.compiler.source>11</maven.compiler.source>
36-
<micronaut.version>2.0.0</micronaut.version>
36+
<micronaut.version>2.0.3</micronaut.version>
3737
</properties>
3838

39-
<dependencyManagement>
40-
<dependencies>
41-
<dependency>
42-
<groupId>io.micronaut</groupId>
43-
<artifactId>micronaut-bom</artifactId>
44-
<version>${micronaut.version}</version>
45-
<type>pom</type>
46-
<scope>import</scope>
47-
</dependency>
48-
</dependencies>
49-
</dependencyManagement>
50-
5139
<dependencies>
5240
<dependency>
5341
<groupId>io.micronaut</groupId>
5442
<artifactId>micronaut-inject</artifactId>
43+
<version>${micronaut.version}</version>
5544
<scope>compile</scope>
5645
</dependency>
5746
<dependency>
5847
<groupId>io.micronaut</groupId>
5948
<artifactId>micronaut-validation</artifactId>
49+
<version>${micronaut.version}</version>
6050
<scope>compile</scope>
6151
</dependency>
6252
<dependency>
6353
<groupId>io.micronaut</groupId>
6454
<artifactId>micronaut-runtime</artifactId>
55+
<version>${micronaut.version}</version>
6556
<scope>compile</scope>
6657
</dependency>
6758
<dependency>
6859
<groupId>io.micronaut</groupId>
6960
<artifactId>micronaut-http-client</artifactId>
61+
<version>${micronaut.version}</version>
7062
<scope>compile</scope>
7163
</dependency>
7264
<dependency>
7365
<groupId>javax.annotation</groupId>
7466
<artifactId>javax.annotation-api</artifactId>
67+
<version>1.3.2</version>
7568
<scope>compile</scope>
7669
</dependency>
7770
<dependency>
7871
<groupId>io.micronaut</groupId>
7972
<artifactId>micronaut-http-server-netty</artifactId>
73+
<version>${micronaut.version}</version>
8074
<scope>compile</scope>
8175
</dependency>
8276
<dependency>
83-
<groupId>junit</groupId>
77+
<groupId>junit</groupId>
8478
<artifactId>junit</artifactId>
8579
<version>4.13</version>
8680
<scope>test</scope>

‎appengine-java8/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>3.5.11</version>
90+
<version>3.5.13</version>
9191
<scope>test</scope>
9292
</dependency>
9393
<dependency>

‎appengine-java8/bigquery/pom.xml

< 10000 /div>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-bigquery</artifactId>
55-
<version>1.118.0</version>
55+
<version>1.120.0</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.cloud</groupId>
5959
<artifactId>google-cloud-monitoring</artifactId>
60-
<version>2.0.1</version>
60+
<version>2.0.3</version>
6161
</dependency>
6262

6363
<dependency>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>org.mockito</groupId>
9696
<artifactId>mockito-core</artifactId>
97-
<version>3.5.11</version>
97+
<version>3.5.13</version>
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>

‎appengine-java8/helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ limitations under the License.
8787
<dependency>
8888
<groupId>org.mockito</groupId>
8989
<artifactId>mockito-core</artifactId>
90-
<version>3.5.11</version>
90+
<version>3.5.13</version>
9191
<scope>test</scope>
9292
</dependency>
9393
</dependencies>

‎appengine-java8/multitenancy/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.googlecode.objectify</groupId>
7070
<artifactId>objectify</artifactId>
71-
<version>6.0.6</version>
71+
<version>6.0.7</version>
7272
</dependency>
7373
<!-- [END Objectify_Dependencies] -->
7474

‎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.5.11</version>
69+
<version>3.5.13</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.appengine</groupId>

‎appengine-java8/tasks/app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Copyright 2019 Google LLC
5050
<dependency>
5151
<groupId>com.google.cloud</groupId>
5252
<artifactId>google-cloud-tasks</artifactId>
53-
<version>1.30.1</version>
53+
<version>1.30.3</version>
5454
</dependency>
5555

5656
<!-- Test Dependencies -->

‎appengine-java8/tasks/quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Copyright 2018 Google LLC
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-tasks</artifactId>
55-
<version>1.30.1</version>
55+
<version>1.30.3</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>commons-cli</groupId>

‎appengine-java8/tasks/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Copyright 2019 Google LLC
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-tasks</artifactId>
47-
<version>1.30.1</version>
47+
<version>1.30.3</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>com.google.protobuf</groupId>

‎automl/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# AutoML Samples have been moved
2+
3+
[https://github.com/googleapis/java-automl](https://github.com/googleapis/java-automl/tree/master/samples).

‎datacatalog/quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.cloud</groupId>
4141
<artifactId>google-cloud-datacatalog</artifactId>
42-
<version>1.0.1</version>
42+
<version>1.0.3</version>
4343
</dependency>
4444

4545
<!-- Test dependencies -->

‎dataflow/encryption-keys/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.cloud.samples</groupId>
2424
<artifactId>shared-configuration</artifactId>
25-
<version>1.0.17</version>
25+
<version>1.0.18</version>
2626
</parent>
2727

2828
<groupId>com.example</groupId>

‎dataflow/flex-templates/kafka_to_bigquery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.cloud.samples</groupId>
2424
<artifactId>shared-configuration</artifactId>
25-
<version>1.0.17</version>
25+
<version>1.0.18</version>
2626
</parent>
2727

2828
<groupId>org.apache.beam.samples</groupId>

‎dataflow/flex-templates/streaming_beam_sql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.cloud.samples</groupId>
2424
<artifactId>shared-configuration</artifactId>
25-
<version>1.0.17</version>
25+
<version>1.0.18</version>
2626
</parent>
2727

2828
<groupId>org.apache.beam.samples</groupId>

‎dataflow/templates/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.cloud.samples</groupId>
2424
<artifactId>shared-configuration</artifactId>
25-
<version>1.0.17</version>
25+
<version>1.0.18</version>
2626
</parent>
2727

2828
<groupId>com.example</groupId>

‎dataflow/transforms/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<dependency>
173173
<groupId>org.mockito</groupId>
174174
<artifactId>mockito-core</artifactId>
175-
<version>3.5.11</version>
175+
<version>3.5.13</version>
176176
</dependency>
177177
<dependency>
178178
<groupId>junit</groupId>

‎flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import javax.servlet.http.HttpServletResponse;
3030
import org.apache.http.HttpStatus;
3131

32-
// [START pubsub_appengine_flex_publish]
32+
// [START gae_flex_pubsub_publish]
3333
@WebServlet(name = "Publish with PubSub", value = "/pubsub/publish")
3434
public class PubSubPublish extends HttpServlet {
3535

@@ -57,7 +57,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
5757
resp.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.getMessage());
5858
}
5959
}
60-
// [END pubsub_appengine_flex_publish]
60+
// [END gae_flex_pubsub_publish]
6161

6262
private Publisher publisher;
6363

‎flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPush.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import javax.servlet.http.HttpServletRequest;
2929
import javax.servlet.http.HttpServletResponse;
3030

31-
// [START pubsub_appengine_flex_push]
31+
// [START gae_flex_pubsub_push]
3232
@WebServlet(value = "/pubsub/push")
3333
public class PubSubPush extends HttpServlet {
3434

@@ -52,7 +52,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
5252
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
5353
}
5454
}
55-
// [END pubsub_appengine_flex_push]
55+
// [END gae_flex_pubsub_push]
5656

5757
private Message getMessage(HttpServletRequest request) throws IOException {
5858
String requestBody = request.getReader().lines().collect(Collectors.joining("\n"));

‎functions/concepts/after-timeout/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>org.mockito</groupId>
6363
<artifactId>mockito-core</artifactId>
64-
<version>3.5.11</version>
64+
<version>3.5.13</version>
6565
<scope>test</scope>
6666
</dependency>
6767
</dependencies>

‎functions/concepts/env-vars/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.mockito</groupId>
5757
<artifactId>mockito-core</artifactId>
58-
<version>3.5.11</version>
58+
<version>3.5.13</version>
5959
<scope>test</scope>
6060
</dependency>
6161

< 10000 /code>

‎functions/concepts/execution-count/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.mockito</groupId>
5757
<artifactId>mockito-core</artifactId>
58-
<version>3.5.11</version>
58+
<version>3.5.13</version>
5959
<scope>test</scope>
6060
</dependency>
6161

@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>org.mockito</groupId>
7070
<artifactId>mockito-core</artifactId>
71-
<version>3.5.11</version>
71+
<version>3.5.13</version>
7272
<scope>test</scope>
7373
</dependency>
7474
</dependencies>

‎functions/concepts/file-system/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.mockito</groupId>
5757
<artifactId>mockito-core</artifactId>
58-
<version>3.5.11</version>
58+
<version>3.5.13</version>
5959
<scope>test</scope>
6060
</dependency>
6161

‎functions/concepts/lazy-fields/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.mockito</groupId>
5757
<artifactId>mockito-core</artifactId>
58-
<version>3.5.11</version>
58+
<version>3.5.13</version>
5959
<scope>test</scope>
6060
</dependency>
6161

‎functions/concepts/retry-pubsub/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>org.mockito</groupId>
6363
<artifactId>mockito-core</artifactId>
64-
<version>3.5.11</version>
64+
<version>3.5.13</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

‎functions/concepts/retry-timeout/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>org.mockito</groupId>
6363
<artifactId>mockito-core</artifactId>
64-
<version>3.5.11</version>
64+
<version>3.5.13</version>
6565
<scope>test</scope>
6666
</dependency>
6767

‎functions/concepts/retry-timeout/src/main/java/functions/RetryTimeout.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.cloud.functions.BackgroundFunction;
2222
import com.google.cloud.functions.Context;
2323
import com.google.gson.Gson;
24-
import com.google.gson.JsonObject;
2524
import functions.eventpojos.PubSubMessage;
2625
import java.time.Duration;
2726
import java.time.ZoneOffset;
@@ -42,25 +41,19 @@ public class RetryTimeout implements BackgroundFunction<PubSubMessage> {
4241
@Override
4342
public void accept(PubSubMessage message, Context context) {
4443
ZonedDateTime utcNow = ZonedDateTime.now(ZoneOffset.UTC);
45-
ZonedDateTime timestamp = utcNow;
44+
ZonedDateTime timestamp = ZonedDateTime.parse(context.timestamp());
4645

47-
String data = message.getData();
48-
JsonObject body = gson.fromJson(data, JsonObject.class);
49-
if (body != null && body.has("timestamp")) {
50-
String tz = body.get("timestamp").getAsString();
51-
timestamp = ZonedDateTime.parse(tz);
52-
}
5346
long eventAge = Duration.between(timestamp, utcNow).toMillis();
5447

5548
// Ignore events that are too old
5649
if (eventAge > MAX_EVENT_AGE) {
57-
logger.info(String.format("Dropping event %s.", data));
50+
logger.info(String.format("Dropping event with timestamp %s.", timestamp));
5851
return;
5952
}
6053

6154
// Process events that are recent enough
6255
// To retry this invocation, throw an exception here
63-
logger.info(String.format("Processing event %s.", data));
56+
logger.info(String.format("Processing event with timestamp %s.", timestamp));
6457
}
6558
}
6659
// [END functions_tips_infinite_retries]

0 commit comments

Comments
 (0)
0