Ludo java21

appengine-java8/README.md → appengine-java21/README.md

@@ -1,6 +1,6 @@
-# Google App Engine Standard Environment Samples for Java 8
+# Google App Engine Standard Environment Samples for Java 21
 
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/README.md">
 <img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
 This is a repository that contains Java code samples for [Google App Engine
@@ -43,7 +43,7 @@ access control, billing, and services.
 This sample demonstrates how to deploy an application on Google App Engine.
 
 - [Documentation][ae-docs]
-- [Code](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/appengine-standard-java8/helloworld)
+- [Code](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/appengine-standard-java21/helloworld)
 
 ### Sending Email
 

appengine-java8/analytics/README.md → appengine-java21/analytics/README.md

@@ -1,6 +1,6 @@
 # Google Analytics sample for Google App Engine
 
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/analytics/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/analytics/README.md">
 <img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
 Integrating App Engine with Google Analytics.
@@ -14,7 +14,7 @@ and set it as an environment variable in [`appengine-web.xml`](src/main/webapp/W
 
 ## Running locally
 This example uses the
-[Maven Cloud SDK based plugin](https://cloud.google.com/appengine/docs/java/tools/using-maven).
+[Maven Cloud CLI based plugin](https://cloud.google.com/appengine/docs/java/tools/using-maven).
 To run this sample locally:
 
     $ mvn appengine:run

appengine-java8/analytics/pom.xml → appengine-java21/analytics/pom.xml

@@ -1,5 +1,5 @@
 <!--
- Copyright 2017 Google Inc.
+ Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-analytics-j8</artifactId>
+  <artifactId>appengine-analytics-j21</artifactId>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.

appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java → appengine-java21/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/analytics/src/main/webapp/WEB-INF/appengine-web.xml → appengine-java21/analytics/src/main/webapp/WEB-INF/appengine-web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc.
+  Copyright 2024 Google LLC
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -14,9 +14,14 @@
 -->
 <!-- [END_EXCLUDE] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-  <threadsafe>true</threadsafe>
-  <runtime>java8</runtime>
-  <env-variables>
+
+  <runtime>java21</runtime>
+   <app-engine-apis>true</app-engine-apis>
+  <system-properties>
+    <property name="appengine.use.EE8" value="true"/>
+  </system-properties>
+
+   <env-variables>
     <env-var name="GA_TRACKING_ID" value="YOUR-GA-TRACKING-ID" />
   </env-variables>
 </appengine-web-app>

appengine-java8/analytics/src/main/webapp/WEB-INF/web.xml → appengine-java21/analytics/src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc.
+  Copyright 2024 Google LLC
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

appengine-java8/appidentity/README.md → appengine-java21/appidentity/README.md

@@ -1,6 +1,6 @@
 # App Identity sample for Google App Engine
 
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/appidentity/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/appidentity/README.md">
 <img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
 
@@ -12,7 +12,7 @@ Engine][ae-docs].
 
 ## Running locally
 This example uses the
-[Maven Cloud SDK based plugin](https://cloud.google.com/appengine/docs/java/tools/using-maven).
+[Maven Cloud CLI based plugin](https://cloud.google.com/appengine/docs/java/tools/using-maven).
 To run this sample locally:
 
     $ mvn appengine:run

appengine-java8/appidentity/pom.xml → appengine-java21/appidentity/pom.xml

@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc.
+ Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-appidentity-j8</artifactId>
+  <artifactId>appengine-appidentity-j21</artifactId>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java → appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 )
 public class IdentityServlet extends HttpServlet {
 
+  // [START gae_java21_app_identity_versioned_hostnames]
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     resp.setContentType("text/plain");
@@ -40,4 +41,5 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     resp.getWriter()
         .println(env.getAttributes().get("com.google.appengine.runtime.default_version_hostname"));
   }
+  // [END gae_java21_app_identity_versioned_hostnames]
 }

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java → appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public SignForAppServlet() {
     appIdentity = AppIdentityServiceFactory.getAppIdentityService();
   }
 
-  // [START gae_java8_app_identity_other_services]
+  // [START gae_java21_app_identity_other_services]
   // Note that the algorithm used by AppIdentity.signForApp() and
   // getPublicCertificatesForApp() is "SHA256withRSA"
 
@@ -102,7 +102,7 @@ private String simulateIdentityAssertion()
         "isValid=%b for message: %s\n\tsignature: %s\n\tpublic cert: %s",
         isValid, message, Arrays.toString(blobSignature), Arrays.toString(publicCert));
   }
-  // [END gae_java8_app_identity_other_services]
+  // [END gae_java21_app_identity_other_services]
 
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java → appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 
 @SuppressWarnings("serial")
 class UrlShortener {
-  // [START gae_java8_app_identity_google_apis]
+  // [START gae_java21_app_identity_google_apis]
 
   /**
    * Returns a shortened URL by calling the Google URL Shortener API.
@@ -74,5 +74,5 @@ public String createShortUrl(String longUrl) throws Exception {
       }
     }
   }
-  // [END gae_java8_app_identity_google_apis]
+  // [END gae_java21_app_identity_google_apis]
 }

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java → appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java21/appidentity/src/main/webapp/WEB-INF/appengine-web.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <runtime>java21</runtime>
+   <app-engine-apis>true</app-engine-apis>
+  <system-properties>
+    <property name="appengine.use.EE8" value="true"/>
+  </system-properties>
+
+</appengine-web-app>

appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java → appengine-java21/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java → appengine-java21/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/bigquery/README.md → appengine-java21/bigquery/README.md

@@ -1,7 +1,7 @@
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/bigquery/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/bigquery/README.md">
 <img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
-# Google Cloud API Showcase: BigQuery & Cloud Monitoring in App Engine standard environment for Java 8
+# Google Cloud API Showcase: BigQuery & Cloud Monitoring in App Engine standard environment for Java 21
 
 This API Showcase demonstrates how to run an App Engine standard environment application with dependencies on both 
 [Google BigQuery][bigquery] and [StackDriver Monitoring][monitoring].
@@ -16,11 +16,11 @@ The home page also provides a summary view of the metrics that have been logged
 
 ## Clone the sample app
 
-Copy the sample apps to your local machine, and cd to the `appengine-java8/bigquery` directory:
+Copy the sample apps to your local machine, and cd to the `appengine-java21/bigquery` directory:
 
 ```
 git clone https://github.com/GoogleCloudPlatform/java-docs-samples
-cd appengine-java8/bigquery
+cd appengine-java21/bigquery
 ```
 
 ## Setup

appengine-java8/bigquery/pom.xml → appengine-java21/bigquery/pom.xml

@@ -1,5 +1,5 @@
 <!--
- Copyright 2018 Google Inc.
+ Copyright 2024 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-bigquery-monitoring-j8</artifactId>
+  <artifactId>appengine-bigquery-monitoring-j21</artifactId>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.

appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryHome.java → appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryHome.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRun.java → appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRun.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java → appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/TimeSeriesSummary.java → appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/TimeSeriesSummary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java21/bigquery/src/main/webapp/WEB-INF/appengine-web.xml

@@ -0,0 +1,10 @@
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+
+  <runtime>java21</runtime>
+  <app-engine-apis>true</app-engine-apis>
+  <system-properties>
+    <property name="appengine.use.EE8" value="true"/>
+  </system-properties>
+
+  <application>dzlier-work</application>
+</appengine-web-app>

appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java → appengine-java21/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appengine-java8/bigtable/README.md → appengine-java21/bigtable/README.md

@@ -1,18 +1,18 @@
-Bigtable-hello-j8
+Bigtable-hello-j21
 =================
 
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java8/bigtable/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/bigtable/README.md">
 <img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
-Moves the Bigtable Hello World application to Google App Engine Standard for Java 8.
+Moves the Bigtable Hello World application to Google App Engine Standard for Java 21.
 
 
-* [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+* [Java 21](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
 * [Maven](https://maven.apache.org/download.cgi) (at least 3.3.9)
 * [Gradle](https://gradle.org)
-* [Google Cloud SDK](https://cloud.google.com/sdk/) (aka gcloud)
+* [Google Cloud CLI](https://cloud.google.com/sdk/) (aka gcloud)
 
-Initialize the Google Cloud SDK using:
+Initialize the Google Cloud CLI using:
 
     gcloud init
 
@@ -27,7 +27,7 @@ Then you need to [Create a Cloud Bigtable Instance](https://cloud.google.com/big
 
     mvn -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengine:run
 
-### Deploy to App Engine Standard for Java 8
+### Deploy to App Engine Standard for Java 21
 
     mvn -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID package appengine:deploy
 
@@ -41,7 +41,7 @@ Then you need to [Create a Cloud Bigtable Instance](https://cloud.google.com/big
 
     gradle -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengineRun
 
-### Integration Tests & Deploy to App Engine Standard for Java 8
+### Integration Tests & Deploy to App Engine Standard for Java 21
 
     gradle -Dbigtable.projectID=PROJECTID -Dbigtable.instanceID=INSTANCEID appengineDeploy
 

appengine-java8/bigtable/build.gradle → appengine-java21/bigtable/build.gradle

@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2024 Google LLC
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ apply plugin: 'com.google.cloud.tools.appengine'
 group = 'com.example.google.cloud.bigtable'
 version = '0.1-SNAPSHOT'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'

appengine-java8/bigtable/pom.xml → appengine-java21/bigtable/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc.
+Copyright 2024 Google LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ limitations under the License.
   <version>0.1-SNAPSHOT</version>
 
   <groupId>com.example.appengine</groupId>
-  <artifactId>bigtable-hello-j8</artifactId>
+  <artifactId>bigtable-hello-j21</artifactId>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.