Skip to content

Commit 8ca37ee

Browse files
averikitschaverikitsch
authored
update region tags (GoogleCloudPlatform#1179)
* region tags: request/logging example * analytics * mailgun * mailjet, sendgrid * cloud sql and postgresql and datastore * Storage, twilio * pubsub * fixed app.yaml errors
1 parent a7690e7 commit 8ca37ee

File tree

29 files changed

+68
-79
lines changed

29 files changed

+68
-79
lines changed

‎appengine-java8/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import javax.servlet.http.HttpServletRequest;
2323
import javax.servlet.http.HttpServletResponse;
2424

25-
// [START simple_logging_example]
25+
// [START gae_java8_logging_example]
2626
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
2727
@WebServlet(
2828
name = "RequestLogging",
@@ -44,4 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
4444
// [END_EXCLUDE]
4545
}
4646
}
47-
// [END simple_logging_example]
47+
// [END gae_java8_logging_example]

‎appengine-java8/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.servlet.http.HttpServletRequest;
2222
import javax.servlet.http.HttpServletResponse;
2323

24-
// [START simple_request_example]
24+
// [START gae_java8_request_example]
2525
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
2626
@WebServlet(name = "requests", description = "Requests: Trivial request", urlPatterns = "/requests")
2727
public class RequestsServlet extends HttpServlet {
@@ -32,4 +32,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
3232
resp.getWriter().println("Hello, world");
3333
}
3434
}
35-
// [END simple_request_example]
35+
// [END gae_java8_request_example]

‎appengine/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.servlet.http.HttpServletRequest;
2222
import javax.servlet.http.HttpServletResponse;
2323

24-
// [START simple_logging_example]
24+
// [START gae_java_logging_example]
2525
public class LoggingServlet extends HttpServlet {
2626
private static final Logger log = Logger.getLogger(LoggingServlet.class.getName());
2727

@@ -36,6 +36,5 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
3636
resp.getWriter().println("Check logs for results");
3737
// [END_EXCLUDE]
3838
}
39-
}
40-
// [END simple_logging_example]
41-
39+
}
40+
// [END gae_java_logging_example]

‎appengine/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import javax.servlet.http.HttpServletRequest;
2121
import javax.servlet.http.HttpServletResponse;
2222

23-
// [START simple_request_example]
23+
// [START gae_java_request_example]
2424
public class RequestsServlet extends HttpServlet {
2525
@Override
2626
public void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -29,5 +29,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
2929
resp.getWriter().println("Hello, world");
3030
}
3131
}
32-
// [END simple_request_example]
33-
32+
// [END gae_java_request_example]

‎flexible/analytics/src/main/appengine/app.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ handlers:
55
- url: /.*
66
script: this field is required, but ignored
77

8-
# [START env_variables]
8+
# [START gae_flex_analytics_env_variables]
99
env_variables:
1010
GA_TRACKING_ID: YOUR-GA-TRACKING-ID
11-
# [END env_variables]
11+
# [END gae_flex_analytics_env_variables]

‎flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.http.client.utils.URIBuilder;
3030
import org.apache.http.impl.client.HttpClientBuilder;
3131

32-
// [START example]
32+
// [START gae_flex_analytics_track_event]
3333
@SuppressWarnings("serial")
3434
@WebServlet(name = "analytics", value = "")
3535
public class AnalyticsServlet extends HttpServlet {
@@ -63,4 +63,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
6363
resp.getWriter().println("Event tracked.");
6464
}
6565
}
66-
// [END example]
66+
// [END gae_flex_analytics_track_event]

‎flexible/cloudsql/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<version>1.0.9</version>
3131
</parent>
3232

33-
<!-- [START properties] -->
33+
<!-- [START gae_flex_mysql_properties] -->
3434
<properties>
3535
<!--
3636
INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
@@ -50,7 +50,7 @@
5050
<!-- [END_EXCLUDE] -->
5151
<sqlURL>jdbc:mysql://google/${database}?cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}&amp;useSSL=false</sqlURL>
5252
</properties>
53-
<!-- [END properties] -->
53+
<!-- [END gae_flex_mysql_properties] -->
5454

5555
<dependencies>
5656
<dependency>
@@ -75,7 +75,7 @@
7575
<type>jar</type>
7676
<scope>provided</scope>
7777
</dependency>
78-
<!-- [START dependencies] -->
78+
<!-- [START gae_flex_mysql_dependencies] -->
7979
<dependency> <!-- http://dev.mysql.com/doc/connector-j/en/ -->
8080
<groupId>mysql</groupId>
8181
<artifactId>mysql-connector-java</artifactId>
@@ -86,17 +86,17 @@
8686
<artifactId>mysql-socket-factory-connector-j-6</artifactId>
8787
<version>1.0.10</version>
8888
</dependency>
89-
<!-- [END dependencies] -->
89+
<!-- [END gae_flex_mysql_dependencies] -->
9090
</dependencies>
9191
<build>
92-
<!-- [START resources] -->
92+
<!-- [START gae_flex_mysql_resources] -->
9393
<resources>
9494
<resource>
9595
<directory>src/main/resources</directory>
9696
<filtering>true</filtering>
9797
</resource>
9898
</resources>
99-
<!-- [END resources] -->
99+
<!-- [END gae_flex_mysql_resources] -->
100100
<!-- for hot reload of the web application -->
101101
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
102102
<plugins>

‎flexible/cloudsql/src/main/java/com/example/cloudsql/CloudSqlServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import javax.servlet.http.HttpServletRequest;
4040
import javax.servlet.http.HttpServletResponse;
4141

42-
// [START example]
42+
// [START gae_flex_mysql_app]
4343
@SuppressWarnings("serial")
4444
@WebServlet(name = "cloudsql", value = "")
4545
public class CloudSqlServlet extends HttpServlet {
@@ -126,4 +126,4 @@ public void init() throws ServletException {
126126
}
127127
}
128128
}
129-
// [END example]
129+
// [END gae_flex_mysql_app]

‎flexible/cloudstorage/src/main/appengine/app.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ handlers:
55
- url: /.*
66
script: this field is required, but ignored
77

8-
# [START env_variables]
98
env_variables:
109
BUCKET_NAME: YOUR-BUCKET-NAME
11-
# [END env_variables]

‎flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import javax.servlet.http.HttpServletResponse;
3535
import javax.servlet.http.Part;
3636

37-
// [START example]
37+
// [START gae_flex_storage_app]
3838
@SuppressWarnings("serial")
3939
@WebServlet(name = "upload", value = "/upload")
4040
@MultipartConfig()
@@ -67,4 +67,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
6767
resp.getWriter().print(blob.getMediaLink());
6868
}
6969
}
70-
// [END example]
70+
// [END gae_flex_storage_app]

‎flexible/datastore/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
<type>jar</type>
4646
<scope>provided</scope>
4747
</dependency>
48-
<!-- [START dependencies] -->
48+
<!-- [START gae_flex_datastore_config] -->
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>google-cloud-datastore</artifactId>
5252
<version>1.38.0</version>
5353
</dependency>
54-
<!-- [END dependencies] -->
54+
<!-- [END gae_flex_datastore_config] -->
5555
</dependencies>
5656
<build>
5757
<!-- for hot reload of the web application -->

‎flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import javax.servlet.http.HttpServletRequest;
4040
import javax.servlet.http.HttpServletResponse;
4141

42-
// [START example]
42+
// [START gae_flex_datastore_app]
4343
@SuppressWarnings("serial")
4444
@WebServlet(name = "datastore", value = "")
4545
public class DatastoreServlet extends HttpServlet {
@@ -82,4 +82,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
8282
}
8383
}
8484
}
85-
// [END example]
85+
// [END gae_flex_datastore_app]

‎flexible/mailgun/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>
51-
<!-- [START dependencies] -->
51+
<!-- [START gae_flex_mailgun_dependencies] -->
5252
<dependency>
5353
<groupId>com.sun.jersey</groupId>
5454
<artifactId>jersey-core</artifactId>
@@ -64,7 +64,7 @@
6464
<artifactId>jersey-multipart</artifactId>
6565
<version>1.19.4</version>
6666
</dependency>
67-
<!-- [END dependencies] -->
67+
<!-- [END gae_flex_mailgun_dependencies] -->
6868
</dependencies>
6969

7070
<build>

‎flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import javax.servlet.http.HttpServletResponse;
3434
import javax.ws.rs.core.MediaType;
3535

36-
// [START example]
3736
@SuppressWarnings("serial")
3837
@WebServlet(name = "mailgun", value = "/send/email")
3938
public class MailgunServlet extends HttpServlet {
@@ -57,7 +56,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
5756
}
5857

5958
//CHECKSTYLE OFF: VariableDeclarationUsageDistance
60-
// [START simple]
59+
// [START gae_flex_mailgun_simple_message]
6160
private ClientResponse sendSimpleMessage(String recipient) {
6261
Client client = Client.create();
6362
client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
@@ -71,9 +70,9 @@ private ClientResponse sendSimpleMessage(String recipient) {
7170
return webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
7271
formData);
7372
}
74-
// [END simple]
73+
// [END gae_flex_mailgun_simple_message]
7574

76-
// [START complex]
75+
// [START gae_flex_mailgun_complex_message]
7776
private ClientResponse sendComplexMessage(String recipient) {
7877
Client client = Client.create();
7978
client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
@@ -90,7 +89,6 @@ private ClientResponse sendComplexMessage(String recipient) {
9089
return webResource.type(MediaType.MULTIPART_FORM_DATA_TYPE)
9190
.post(ClientResponse.class, formData);
9291
}
93-
// [END complex]
92+
// [END gae_flex_mailgun_complex_message]
9493
//CHECKSTYLE ON: VariableDeclarationUsageDistance
9594
}
96-
// [END example]

‎flexible/mailjet/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
<type>jar</type>
5151
<scope>provided</scope>
5252
</dependency>
53-
<!-- [START dependencies] -->
53+
<!-- [START gae_flex_mailjet_dependencies] -->
5454
<dependency>
5555
<groupId>com.mailjet</groupId>
5656
<artifactId>mailjet-client</artifactId>
5757
<version>${mailjet-version}</version>
5858
</dependency>
59-
<!-- [END dependencies] -->
59+
<!-- [END gae_flex_mailjet_dependencies] -->
6060
</dependencies>
6161
<build>
6262
<!-- for hot reload of the web application -->

‎flexible/mailjet/src/main/appengine/app.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ handlers:
55
- url: /.*
66
script: this field is required, but ignored
77

8-
# [START env_variables]
8+
# [START gae_flex_mailjet_yaml]
99
env_variables:
1010
MAILJET_API_KEY: YOUR-MAILJET-API-KEY
1111
MAILJET_SECRET_KEY: YOUR-MAILJET-SECRET-KEY
12-
# [END env_variables]
12+
# [END gae_flex_mailjet_yaml]

‎flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
// [START mailjet_imports]
17+
// [START gae_flex_mailjet_config]
1818

1919
package com.example.mailjet;
2020

@@ -34,9 +34,9 @@
3434
import org.json.JSONArray;
3535
import org.json.JSONObject;
3636

37-
// [END mailjet_imports]
37+
// [END gae_flex_mailjet_config]
3838

39-
// [START app]
39+
// [START gae_flex_mailjet_send_message]
4040
@SuppressWarnings("serial")
4141
@WebServlet(name = "mailjet", value = "/send/email")
4242
public class MailjetServlet extends HttpServlet {
@@ -80,4 +80,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
8080
}
8181
}
8282
}
83-
// [END app]
83+
// [END gae_flex_mailjet_send_message]

‎flexible/postgres/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<version>1.0.9</version>
3131
</parent>
3232

33-
<!-- [START properties] -->
33+
<!-- [START gae_flex_postgres_properties] -->
3434
<properties>
3535
<!--
3636
INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
@@ -50,7 +50,7 @@
5050
<!-- [END_EXCLUDE] -->
5151
<sqlURL>jdbc:postgresql://google/${database}?useSSL=false&amp;socketFactoryArg=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.postgres.SocketFactory&amp;user=${user}&amp;password=${password}</sqlURL>
5252
</properties>
53-
<!-- [END properties] -->
53+
<!-- [END gae_flex_postgres_properties] -->
5454

5555
<dependencies>
5656
<dependency>
@@ -75,7 +75,7 @@
7575
<type>jar</type>
7676
<scope>provided</scope>
7777
</dependency>
78-
<!-- [START dependencies] -->
78+
<!-- [START gae_flex_postgres_dependencies] -->
7979
<dependency>
8080
<groupId>org.postgresql</groupId>
8181
<artifactId>postgresql</artifactId>
@@ -87,17 +87,17 @@
8787
<artifactId>postgres-socket-factory</artifactId>
8888
<version>1.0.10</version>
8989
</dependency>
90-
<!-- [END dependencies] -->
90+
<!-- [END gae_flex_postgres_dependencies] -->
9191
</dependencies>
9292
<build>
93-
<!-- [START resources] -->
93+
<!-- [START gae_flex_postgres_resources] -->
9494
<resources>
9595
<resource>
9696
<directory>src/main/resources</directory>
9797
<filtering>true</filtering>
9898
</resource>
9999
</resources>
100-
<!-- [END resources] -->
100+
<!-- [END gae_flex_postgres_resources] -->
101101
<!-- for hot reload of the web application -->
102102
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
103103
<plugins>

‎flexible/postgres/src/main/java/com/example/postgres/PostgresSqlServlet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import javax.servlet.http.HttpServletRequest;
4040
import javax.servlet.http.HttpServletResponse;
4141

42-
// [START example]
42+
// [START gae_flex_postgres_app]
4343
@SuppressWarnings("serial")
4444
@WebServlet(name = "postgresql", value = "")
4545
public class PostgresSqlServlet extends HttpServlet {
@@ -124,4 +124,4 @@ public void init() throws ServletException {
124124
}
125125
}
126126
}
127-
// [END example]
127+
// [END gae_flex_postgres_app]

0 commit comments

Comments
 (0)