Update cloud-sql sample region tags. (GoogleCloudPlatform#1322)

kurtisvg · web-flow · commit f19a06ecdb65 · 2019-02-04T10:33:32.000-08:00
* Updated mysql/servlet region tags.
* Updated postgres/servlet region tags.
diff --git a/cloud-sql/mysql/servlet/src/main/java/com/example/cloudsql/ConnectionPoolContextListener.java b/cloud-sql/mysql/servlet/src/main/java/com/example/cloudsql/ConnectionPoolContextListener.java
@@ -34,13 +34,14 @@ public class ConnectionPoolContextListener implements ServletContextListener {
 
   // Saving credentials in environment variables is convenient, but not secure - consider a more
   // secure solution such as https://cloud.google.com/kms/ to help keep secrets safe.
-  private static final String CLOUD_SQL_INSTANCE_NAME = System.getenv("CLOUD_SQL_INSTANCE_NAME");
+  private static final String CLOUD_SQL_CONNECTION_NAME = System.getenv(
+      "CLOUD_SQL_CONNECTION_NAME");
   private static final String DB_USER = System.getenv("DB_USER");
   private static final String DB_PASS = System.getenv("DB_PASS");
   private static final String DB_NAME = System.getenv("DB_NAME");
 
   private DataSource createConnectionPool() {
-    // [START cloud_sql_mysql_connection_pool]
+    // [START cloud_sql_mysql_servlet_create]
     // The configuration object specifies behaviors for the connection pool.
     HikariConfig config = new HikariConfig();
 
@@ -52,50 +53,49 @@ private DataSource createConnectionPool() {
     // For Java users, the Cloud SQL JDBC Socket Factory can provide authenticated connections.
     // See https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory for details.
     config.addDataSourceProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
-    config.addDataSourceProperty("cloudSqlInstance", CLOUD_SQL_INSTANCE_NAME);
+    config.addDataSourceProperty("cloudSqlInstance", CLOUD_SQL_CONNECTION_NAME);
     config.addDataSourceProperty("useSSL", "false");
 
     // ... Specify additional connection properties here.
-
     // [START_EXCLUDE]
 
-    // [START cloud_sql_mysql_limit_connections]
+    // [START cloud_sql_mysql_servlet_limit]
     // maximumPoolSize limits the total number of concurrent connections this pool will keep. Ideal
     // values for this setting are highly variable on app design, infrastructure, and database.
     config.setMaximumPoolSize(5);
     // minimumIdle is the minimum number of idle connections Hikari maintains in the pool.
     // Additional connections will be established to meet this value unless the pool is full.
     config.setMinimumIdle(5);
-    // [END cloud_sql_mysql_limit_connections]
+    // [END cloud_sql_mysql_servlet_limit]
 
-    // [START cloud_sql_mysql_connection_timeout]
+    // [START cloud_sql_mysql_servlet_timeout]
     // setConnectionTimeout is the maximum number of milliseconds to wait for a connection checkout.
     // Any attempt to retrieve a connection from this pool that exceeds the set limit will throw an
     // SQLException.
     config.setConnectionTimeout(10000); // 10 seconds
     // idleTimeout is the maximum amount of time a connection can sit in the pool. Connections that
     // sit idle for this many milliseconds are retried if minimumIdle is exceeded.
     config.setIdleTimeout(600000); // 10 minutes
-    // [END cloud_sql_mysql_connection_timeout]
+    // [END cloud_sql_mysql_servlet_timeout]
 
-    // [START cloud_sql_mysql_connection_backoff]
+    // [START cloud_sql_mysql_servlet_backoff]
     // Hikari automatically delays between failed connection attempts, eventually reaching a
     // maximum delay of `connectionTimeout / 2` between attempts.
-    // [END cloud_sql_mysql_connection_backoff]
+    // [END cloud_sql_mysql_servlet_backoff]
 
-    // [START cloud_sql_mysql_connection_lifetime]
+    // [START cloud_sql_mysql_servlet_lifetime]
     // maxLifetime is the maximum possible lifetime of a connection in the pool. Connections that
     // live longer than this many milliseconds will be closed and reestablished between uses. This
     // value should be several minutes shorter than the database's timeout value to avoid unexpected
     // terminations.
     config.setMaxLifetime(1800000); // 30 minutes
-    // [END cloud_sql_mysql_connection_lifetime]
+    // [END cloud_sql_mysql_servlet_lifetime]
 
     // [END_EXCLUDE]
 
     // Initialize the connection pool using the configuration object.
     DataSource pool = new HikariDataSource(config);
-    // [END cloud_sql_mysql_connection_pool]
+    // [END cloud_sql_mysql_servlet_create]
     return pool;
   }
 
diff --git a/cloud-sql/mysql/servlet/src/main/java/com/example/cloudsql/IndexServlet.java b/cloud-sql/mysql/servlet/src/main/java/com/example/cloudsql/IndexServlet.java
@@ -110,7 +110,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
 
     // Reuse the pool that was created in the ContextListener when the Servlet started.
     DataSource pool = (DataSource) req.getServletContext().getAttribute("my-pool");
-    // [START cloud_sql_mysql_example_statement]
+    // [START cloud_sql_mysql_servlet_connection]
     // Using a try-with-resources statement ensures that the connection is always released back
     // into the pool at the end of the statement (even if an error occurs)
     try (Connection conn = pool.getConnection()) {
@@ -134,7 +134,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
           + "logs for more details.");
       // [END_EXCLUDE]
     }
-    // [END cloud_sql_mysql_example_statement]
+    // [END cloud_sql_mysql_servlet_connection]
 
     resp.setStatus(200);
     resp.getWriter().printf("Vote successfully cast for '%s' at time %s!\n", team, now);
diff --git a/cloud-sql/postgres/servlet/src/main/java/com/example/cloudsql/ConnectionPoolContextListener.java b/cloud-sql/postgres/servlet/src/main/java/com/example/cloudsql/ConnectionPoolContextListener.java
@@ -34,13 +34,14 @@ public class ConnectionPoolContextListener implements ServletContextListener {
 
   // Saving credentials in environment variables is convenient, but not secure - consider a more
   // secure solution such as https://cloud.google.com/kms/ to help keep secrets safe.
-  private static final String CLOUD_SQL_INSTANCE_NAME = System.getenv("CLOUD_SQL_INSTANCE_NAME");
+  private static final String CLOUD_SQL_CONNECTION_NAME = System.getenv(
+      "CLOUD_SQL_CONNECTION_NAME");
   private static final String DB_USER = System.getenv("DB_USER");
   private static final String DB_PASS = System.getenv("DB_PASS");
   private static final String DB_NAME = System.getenv("DB_NAME");
 
   private DataSource createConnectionPool() {
-    // [START cloud_sql_postgres_connection_pool]
+    // [START cloud_sql_postgres_servlet_create]
     // The configuration object specifies behaviors for the connection pool.
     HikariConfig config = new HikariConfig();
 
@@ -52,49 +53,49 @@ private DataSource createConnectionPool() {
     // For Java users, the Cloud SQL JDBC Socket Factory can provide authenticated connections.
     // See https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory for details.
     config.addDataSourceProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
-    config.addDataSourceProperty("cloudSqlInstance", CLOUD_SQL_INSTANCE_NAME);
+    config.addDataSourceProperty("cloudSqlInstance", CLOUD_SQL_CONNECTION_NAME);
 
     // ... Specify additional connection properties here.
 
     // [START_EXCLUDE]
 
-    // [START cloud_sql_postgres_limit_connections]
+    // [START cloud_sql_postgres_servlet_limit]
     // maximumPoolSize limits the total number of concurrent connections this pool will keep. Ideal
     // values for this setting are highly variable on app design, infrastructure, and database.
     config.setMaximumPoolSize(5);
     // minimumIdle is the minimum number of idle connections Hikari maintains in the pool.
     // Additional connections will be established to meet this value unless the pool is full.
     config.setMinimumIdle(5);
-    // [END cloud_sql_postgres_limit_connections]
+    // [END cloud_sql_postgres_servlet_limit]
 
-    // [START cloud_sql_postgres_connection_timeout]
+    // [START cloud_sql_postgres_servlet_timeout]
     // setConnectionTimeout is the maximum number of milliseconds to wait for a connection checkout.
     // Any attempt to retrieve a connection from this pool that exceeds the set limit will throw an
     // SQLException.
     config.setConnectionTimeout(10000); // 10 seconds
     // idleTimeout is the maximum amount of time a connection can sit in the pool. Connections that
     // sit idle for this many milliseconds are retried if minimumIdle is exceeded.
     config.setIdleTimeout(600000); // 10 minutes
-    // [END cloud_sql_postgres_connection_timeout]
+    // [END cloud_sql_postgres_servlet_timeout]
 
-    // [START cloud_sql_postgres_connection_backoff]
+    // [START cloud_sql_postgres_servlet_backoff]
     // Hikari automatically delays between failed connection attempts, eventually reaching a
     // maximum delay of `connectionTimeout / 2` between attempts.
-    // [END cloud_sql_postgres_connection_backoff]
+    // [END cloud_sql_postgres_servlet_backoff]
 
-    // [START cloud_sql_postgres_connection_lifetime]
+    // [START cloud_sql_postgres_servlet_lifetime]
     // maxLifetime is the maximum possible lifetime of a connection in the pool. Connections that
     // live longer than this many milliseconds will be closed and reestablished between uses. This
     // value should be several minutes shorter than the database's timeout value to avoid unexpected
     // terminations.
     config.setMaxLifetime(1800000); // 30 minutes
-    // [END cloud_sql_postgres_connection_lifetime]
+    // [END cloud_sql_postgres_servlet_lifetime]
 
     // [END_EXCLUDE]
 
     // Initialize the connection pool using the configuration object.
     DataSource pool = new HikariDataSource(config);
-    // [END cloud_sql_postgres_connection_pool]
+    // [END cloud_sql_postgres_servlet_create]
     return pool;
   }
 
diff --git a/cloud-sql/postgres/servlet/src/main/java/com/example/cloudsql/IndexServlet.java b/cloud-sql/postgres/servlet/src/main/java/com/example/cloudsql/IndexServlet.java
@@ -110,7 +110,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
 
     // Reuse the pool that was created in the ContextListener when the Servlet started.
     DataSource pool = (DataSource) req.getServletContext().getAttribute("my-pool");
-    // [START cloud_sql_postgres_example_statement]
+    // [START cloud_sql_postgres_servlet_connection]
     // Using a try-with-resources statement ensures that the connection is always released back
     // into the pool at the end of the statement (even if an error occurs)
     try (Connection conn = pool.getConnection()) {
@@ -134,7 +134,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
           + "logs for more details.");
       // [END_EXCLUDE]
     }
-    // [END cloud_sql_postgres_example_statement]
+    // [END cloud_sql_postgres_servlet_connection]
 
     resp.setStatus(200);
     resp.getWriter().printf("Vote successfully cast for '%s' at time %s!\n", team, now);
