Address review comments.

ludoch · ludoch · commit 007a7416ea38 · 2025-01-09T05:30:40.000-08:00
diff --git a/appengine-java21/bigquery/README.md b/appengine-java21/bigquery/README.md
@@ -4,7 +4,7 @@
 # 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].
+[Google BigQuery][bigquery] and [Cloud Monitoring][monitoring].
 
 [bigquery]: https://cloud.google.com/bigquery/docs
 [monitoring]: https://cloud.google.com/monitoring/docs
diff --git a/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryHome.java b/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryHome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 
 package com.example.appengine.bigquerylogging;
 
-import com.google.cloud.bigquery.FieldValueList;
-import com.google.cloud.bigquery.TableResult;
 import java.io.IOException;
 import java.util.List;
 
+import com.google.cloud.bigquery.FieldValueList;
+import com.google.cloud.bigquery.TableResult;
+
 public class BigQueryHome {
   private static BigQueryRunner queryRunner;
 
diff --git a/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRun.java b/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRun.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.example.appengine.bigquerylogging;
 
 import java.io.IOException;
+
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
diff --git a/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java b/appengine-java21/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
 
 package com.example.appengine.bigquerylogging;
 
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import com.google.api.Metric;
 import com.google.api.MetricDescriptor;
 import com.google.cloud.ServiceOptions;
@@ -41,13 +49,6 @@
 import com.google.monitoring.v3.TimeSeries;
 import com.google.monitoring.v3.TypedValue;
 import com.google.protobuf.util.Timestamps;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
 
 public class BigQueryRunner {
   private static final String CUSTOM_METRIC_FILTER =
diff --git a/appengine-java21/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java b/appengine-java21/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,35 @@
 
 package com.example.appengine.bigquerylogging;
 
-import static com.google.common.truth.Truth.assertThat;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Collections;
+
 import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.ArgumentCaptor;
 import static org.mockito.ArgumentMatchers.any;
+import org.mockito.Captor;
+import org.mockito.Mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import org.mockito.MockitoAnnotations;
 
 import com.google.api.MetricDescriptor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.cloud.monitoring.v3.MetricServiceClient;
 import com.google.cloud.monitoring.v3.MetricServiceClient.ListMetricDescriptorsPagedResponse;
 import com.google.cloud.monitoring.v3.stub.MetricServiceStub;
+import static com.google.common.truth.Truth.assertThat;
 import com.google.monitoring.v3.CreateMetricDescriptorRequest;
 import com.google.monitoring.v3.CreateTimeSeriesRequest;
 import com.google.monitoring.v3.ListMetricDescriptorsRequest;
 import com.google.protobuf.Empty;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Collections;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 /**
  * Tests for simple app sample.
diff --git a/appengine-java21/bigtable/README.md b/appengine-java21/bigtable/README.md
@@ -10,7 +10,7 @@ Moves the Bigtable Hello World application to Google App Engine Standard for Jav
 * [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 CLI](https://cloud.google.com/sdk/) (aka gcloud)
+* [Google Cloud CLI](https://cloud.google.com/cli/) (aka gcloud)
 
 Initialize the Google Cloud CLI using:
 
diff --git a/appengine-java21/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java b/appengine-java21/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2016 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/appengine-java21/bigtable/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java21/bigtable/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2024 Google LLC
+  Copyright 2016 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
diff --git a/appengine-java21/bigtable/src/main/webapp/bigtable.jsp b/appengine-java21/bigtable/src/main/webapp/bigtable.jsp
@@ -3,7 +3,7 @@
 <%@ page import="com.example.bigtable.BigtableHelloWorld" %>
 <!-- [START_EXCLUDE] -->
 <%--
-  ~ Copyright 2024 Google LLC
+  ~ Copyright 2016 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
diff --git a/appengine-java21/datastore-indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java21/datastore-indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,7 @@
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java21</runtime>
+  <!-- enable Appengine APIs.-->
   <app-engine-apis>true</app-engine-apis>
   <system-properties>
     <property name="appengine.use.EE8" value="true"/>
diff --git a/appengine-java21/mail/src/main/webapp/WEB-INF/logging.properties b/appengine-java21/mail/src/main/webapp/WEB-INF/logging.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Google LLC
+# Copyright 2016 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 @@
 # To use this configuration, copy it into your application's WEB-INF
 # folder and add the following to your appengine-web.xml:
 # 
-#  <system-properties>
+# <system-properties>
 #   <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
 #   </system-properties>
 #
diff --git a/appengine-java21/static-files/src/main/webapp/index.html b/appengine-java21/static-files/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-Copyright 2024 Google LLC
+Copyright 2017 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2024 Google LLC`
	`2`	`+ * Copyright 2016 Google LLC`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`<%@ page import="com.example.bigtable.BigtableHelloWorld" %>`
`4`	`4`	`<!-- [START_EXCLUDE] -->`
`5`	`5`	`<%--`
`6`		`- ~ Copyright 2024 Google LLC`
	`6`	`+ ~ Copyright 2016 Google LLC`
`7`	`7`	`~`
`8`	`8`	`~ Licensed under the Apache License, Version 2.0 (the "License"); you`
`9`	`9`	`~ may not use this file except in compliance with the License. You may`