Update Region Tags (#1193)

* appidentity region tags

* region tag removal

Author: averikitsch

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

@@ -29,7 +29,6 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.http.client.utils.URIBuilder;
 
-// [START example]
 @SuppressWarnings("serial")
 // With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
 @WebServlet(
@@ -68,4 +67,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
     resp.getWriter().println("Event tracked.");
   }
 }
-// [END example]

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

@@ -32,7 +32,7 @@
 )
 public class IdentityServlet extends HttpServlet {
 
-  // [START versioned_hostnames]
+  // [START gae_java8_app_identity_versioned_hostnames]
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     resp.setContentType("text/plain");
@@ -41,5 +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 versioned_hostnames]
+  // [END gae_java8_app_identity_versioned_hostnames]
 }

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

@@ -54,7 +54,7 @@ public SignForAppServlet() {
     appIdentity = AppIdentityServiceFactory.getAppIdentityService();
   }
 
-  // [START asserting_identity_to_other_services]
+  // [START gae_java8_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 asserting_identity_to_other_services]
+  // [END gae_java8_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

@@ -31,7 +31,7 @@
 
 @SuppressWarnings("serial")
 class UrlShortener {
-  // [START asserting_identity_to_Google_APIs]
+  // [START gae_java8_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 asserting_identity_to_Google_APIs]
+  // [END gae_java8_app_identity_google_apis]
 }

appengine-java8/bigquery/pom.xml

@@ -49,7 +49,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
@@ -60,7 +59,6 @@
       <artifactId>google-cloud-monitoring</artifactId>
       <version>1.38.0</version>
     </dependency>
-    <!-- [END dependencies ] -->
 
     <dependency>
       <groupId>commons-cli</groupId>

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

@@ -16,9 +16,6 @@
 
 package com.example.appengine.bigquerylogging;
 
-// [START bigquery_logging_all]
-// [START bigquery_logging_deps]
-
 import com.google.api.Metric;
 import com.google.api.MetricDescriptor;
 import com.google.cloud.ServiceOptions;
@@ -52,14 +49,12 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
-// [END bigquery_logging_deps]
 
 public class BigQueryRunner {
   private static final String CUSTOM_METRIC_FILTER =
       "metric.type = starts_with(\"custom.googleapis.com/\")";
   private static BigQueryRunner instance;
 
-  // [START bigquery_logging_metrics]
   private static final MetricDescriptor QUERY_DURATION_METRIC = MetricDescriptor
       .newBuilder()
       .setName("custom.googleapis.com/queryDuration")
@@ -81,7 +76,6 @@ public class BigQueryRunner {
   private static final Set<MetricDescriptor> REQUIRED_METRICS = ImmutableSet.of(
       QUERY_DURATION_METRIC, ROWS_RETURNED_METRIC
   );
-  // [END bigquery_logging_metrics]
 
   private static TableResult mostRecentRunResult;
   private static Set<String> existingMetrics = Sets.newHashSet();
@@ -117,7 +111,6 @@ public static TableResult getMostRecentRunResult() {
   }
 
   public void runQuery() throws InterruptedException {
-    // [START bigquery_logging_query]
     QueryJobConfiguration queryConfig =
         QueryJobConfiguration.newBuilder(
             "SELECT "
@@ -150,9 +143,7 @@ public void runQuery() throws InterruptedException {
       // errors, not just the latest one.
       throw new RuntimeException(queryJob.getStatus().getError().toString());
     }
-    // [END bigquery_logging_query]
 
-    // [START bigquery_logging_log_metrics]
     // Log the result metrics.
     TableResult result = queryJob.getQueryResults();
 
@@ -172,7 +163,6 @@ public void runQuery() throws InterruptedException {
     createMetricsIfNeeded();
     client.createTimeSeries(request);
     os.println("Done writing metrics.");
-    // [END bigquery_logging_log_metrics]
 
     mostRecentRunResult = result;
   }
@@ -205,7 +195,6 @@ private TimeSeries prepareMetric(MetricDescriptor requiredMetric, long metricVal
         .build();
   }
 
-  //  [START bigquery_logging_list_time_series]
   public List<TimeSeriesSummary> getTimeSeriesValues() {
     List<TimeSeriesSummary> summaries = Lists.newArrayList();
     createMetricsIfNeeded();
@@ -236,9 +225,7 @@ public List<TimeSeriesSummary> getTimeSeriesValues() {
     }
     return summaries;
   }
-  //  [END bigquery_logging_list_time_series]
 
-  //  [START bigquery_logging_list_and_create_metrics]
   private void createMetricsIfNeeded() {
     // If all required metrics already exist, no need to make service calls.
     if (REQUIRED_METRICS.stream()
@@ -262,9 +249,7 @@ private void createMetricsIfNeeded() {
         .filter(metric -> !existingMetrics.contains(metric.getDisplayName()))
         .forEach(this::createMetric);
   }
-  //  [END bigquery_logging_list_and_create_metrics]
 
-  //  [START bigquery_logging_create_metric]
   private void createMetric(MetricDescriptor newMetric) {
     CreateMetricDescriptorRequest request = CreateMetricDescriptorRequest.newBuilder()
         .setName(projectName)
@@ -273,6 +258,5 @@ private void createMetric(MetricDescriptor newMetric) {
 
     client.createMetricDescriptor(request);
   }
-  //  [END bigquery_logging_create_metric]
+
 }
-// [END bigquery_logging_all]

appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java

@@ -57,9 +57,7 @@ public static String create(Connection connection) {
     try {
       // The admin API lets us create, manage and delete tables
       Admin admin = connection.getAdmin();
-      // [END connecting_to_bigtable]
 
-      // [START creating_a_table]
       // Create a table with a single column family
       HTableDescriptor descriptor = new HTableDescriptor(TableName.valueOf(TABLE_NAME));
       descriptor.addFamily(new HColumnDescriptor(COLUMN_FAMILY_NAME));
@@ -77,7 +75,6 @@ public static String doHelloWorld() {
 
     StringBuilder result = new StringBuilder();
 
-    // [START connecting_to_bigtable]
     // Create the Bigtable connection, use try-with-resources to make sure it gets closed
     Connection connection = BigtableHelper.getConnection();
     result.append(create(connection));
@@ -86,7 +83,6 @@ public static String doHelloWorld() {
 
       // Retrieve the table we just created so we can do some reads and writes
 
-      // [START writing_rows]
       // Write some rows to the table
       result.append("Write some greetings to the table<br>");
       for (int i = 0; i < GREETINGS.length; i++) {
@@ -108,9 +104,7 @@ public static String doHelloWorld() {
         put.addColumn(COLUMN_FAMILY_NAME, COLUMN_NAME, Bytes.toBytes(GREETINGS[i]));
         table.put(put);
       }
-      // [END writing_rows]
 
-      // [START getting_a_row]
       // Get the first greeting by row key
       String rowKey = "greeting0";
       Result getResult = table.get(new Get(Bytes.toBytes(rowKey)));
@@ -123,7 +117,6 @@ public static String doHelloWorld() {
       result.append(greeting);
       result.append("<br>");
 
-      // [START scanning_all_rows]
       // Now scan across all rows.
       Scan scan = new Scan();
 
@@ -135,7 +128,6 @@ public static String doHelloWorld() {
         result.append(Bytes.toString(valueBytes));
         result.append("<br>");
       }
-      // [END scanning_all_rows]
 
     } catch (IOException e) {
       result.append("Exception while running HelloWorld: " + e.getMessage() + "<br>");