Skip to content

Commit 71fa3f9

Browse files
kurtisvgkurtisvg
authored
Update CloudSQL Samples (GoogleCloudPlatform#1094)
* Update mysql sample. * Update postgres sample. * Correct description.
1 parent de00f10 commit 71fa3f9

File tree

8 files changed

+37
-47
lines changed

8 files changed

+37
-47
lines changed

‎appengine-java8/cloudsql-postgres/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Engine standard Java 8
3232
## Running locally
3333

3434
```bash
35-
$ mvn clean appengine:run -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase
35+
$ mvn clean appengine:run -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root -Dpassword=myPassword -Ddatabase=myDatabase
3636
```
3737

3838
## Deploying

‎appengine-java8/cloudsql-postgres/pom.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,23 @@
3030
<version>1.0.9</version>
3131
</parent>
3232

33-
<!-- [START properties] -->
33+
<!-- [START properties] -->
3434
<properties>
35-
<!-- INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
36-
or gcloud sql instances describe <instance>
37-
-->
38-
<INSTANCE_CONNECTION_NAME>Project:Region:Instance</INSTANCE_CONNECTION_NAME>
35+
<!--
36+
INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
37+
or gcloud sql instances describe <instance>
38+
-->
39+
<INSTANCE_CONNECTION_NAME>project:region:instance</INSTANCE_CONNECTION_NAME>
3940
<user>root</user>
4041
<password>myPassword</password>
41-
<database>sqldemo</database>
42+
<database>myDatabase</database>
4243

43-
<!-- [START_EXCLUDE] -->
44+
<!-- [START_EXCLUDE] -->
4445
<maven.compiler.target>1.8</maven.compiler.target>
4546
<maven.compiler.source>1.8</maven.compiler.source>
46-
<!-- [END_EXCLUDE] -->
47+
<!-- [END_EXCLUDE] -->
4748
</properties>
48-
<!-- [END properties] -->
49+
<!-- [END properties] -->
4950

5051
<dependencies>
5152
<dependency>
@@ -78,7 +79,7 @@
7879
<dependency>
7980
<groupId>com.google.cloud.sql</groupId>
8081
<artifactId>postgres-socket-factory</artifactId>
81-
<version>1.0.5</version>
82+
<version>1.0.8</version>
8283
</dependency>
8384
<!-- [END dependencies] -->
8485
</dependencies>

‎appengine-java8/cloudsql-postgres/src/main/java/com/example/appengine/postgresql/PostgreSqlServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
8484

8585
@Override
8686
public void init() throws ServletException {
87-
String url = System.getProperty("postgresql");
87+
String url = System.getProperty("cloudsql");
8888
log("connecting to: " + url);
8989
try {
9090
conn = DriverManager.getConnection(url);

‎appengine-java8/cloudsql-postgres/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<runtime>java8</runtime>
1818

1919
<system-properties>
20-
<property name="postgresql" value="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}" />
20+
<property name="cloudsql" value="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}" />
2121
</system-properties>
2222
</appengine-web-app>
2323
<!-- [END config] -->

‎appengine-java8/cloudsql/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Engine standard Java 8
3434
## Running locally
3535

3636
```bash
37-
$ mvn clean appengine:run -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase
37+
$ mvn clean appengine:run -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root -Dpassword=myPassword -Ddatabase=myDatabase
3838
```
3939

4040
## Deploying

‎appengine-java8/cloudsql/pom.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,25 @@
3030
<version>1.0.9</version>
3131
</parent>
3232

33-
<!-- [START properties] -->
33+
<!-- [START properties] -->
3434
<properties>
35-
<!-- INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
36-
or gcloud sql instances describe <instance>
37-
project:region:instance for Cloud SQL 2nd Generation or
38-
project:instance for Cloud SQL 1st Generation
39-
-->
40-
<INSTANCE_CONNECTION_NAME></INSTANCE_CONNECTION_NAME>
35+
<!--
36+
INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
37+
or gcloud sql instances describe <instance>
38+
project:region:instance for Cloud SQL 2nd Generation or
39+
project:instance for Cloud SQL 1st Generation
40+
-->
41+
<INSTANCE_CONNECTION_NAME>project:region:instance</INSTANCE_CONNECTION_NAME>
4142
<user>root</user>
4243
<password>myPassword</password>
43-
<database>sqldemo</database>
44+
<database>myDatabase</database>
4445

45-
<maven.compiler.target>1.8</maven.compiler.target>
46-
<maven.compiler.source>1.8</maven.compiler.source>
46+
<!-- [START_EXCLUDE] -->
47+
<maven.compiler.target>1.8</maven.compiler.target>
48+
<maven.compiler.source>1.8</maven.compiler.source>
49+
<!-- [END_EXCLUDE] -->
4750
</properties>
48-
<!-- [END properties] -->
51+
<!-- [END properties] -->
4952

5053
<dependencies>
5154
<dependency>
@@ -69,17 +72,15 @@
6972
</dependency>
7073

7174
<!-- [START dependencies] -->
72-
<!-- Driver injected at runtime by the use of <use-google-connector-j> in appengine-web.xml -->
7375
<dependency> <!-- Only used locally -->
7476
<groupId>mysql</groupId>
7577
<artifactId>mysql-connector-java</artifactId>
76-
<version>5.1.42</version> <!-- v5.x.x is for production, v6.x.x EAP X DevAPI -->
78+
<version>5.1.42</version>
7779
</dependency>
7880
<dependency>
7981
<groupId>com.google.cloud.sql</groupId>
80-
<!-- If using MySQL 6.x driver, use mysql-socket-factory-connector-j-6 instead -->
8182
<artifactId>mysql-socket-factory</artifactId>
82-
<version>1.0.5</version>
83+
<version>1.0.8</version>
8384
</dependency>
8485
<!-- [END dependencies] -->
8586
</dependencies>

‎appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,12 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
9191

9292
@Override
9393
public void init() throws ServletException {
94+
String url = System.getProperty("cloudsql");
95+
log("connecting to: " + url);
9496
try {
95-
ApiProxy.Environment env = ApiProxy.getCurrentEnvironment();
96-
Map<String,Object> attr = env.getAttributes();
97-
String hostname = (String) attr.get("com.google.appengine.runtime.default_version_hostname");
98-
99-
String url = hostname.contains("localhost:")
100-
? System.getProperty("cloudsql-local") : System.getProperty("cloudsql");
101-
log("connecting to: " + url);
102-
try {
103-
conn = DriverManager.getConnection(url);
104-
} catch (SQLException e) {
105-
throw new ServletException("Unable to connect to Cloud SQL", e);
106-
}
107-
108-
} finally {
109-
// Nothing really to do here.
97+
conn = DriverManager.getConnection(url);
98+
} catch (SQLException e) {
99+
throw new ServletException("Unable to connect to Cloud SQL", e);
110100
}
111101
}
112102
}

‎appengine-java8/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
1616
<threadsafe>true</threadsafe>
1717
<runtime>java8</runtime>
18-
<use-google-connector-j>true</use-google-connector-j>
1918

2019
<service>cloudsql</service>
2120

2221
<system-properties>
23-
<property name="cloudsql" value="jdbc:google:mysql://${INSTANCE_CONNECTION_NAME}/${database}?user=${user}&amp;password=${password}" />
24-
<property name="cloudsql-local" value="jdbc:mysql://google/${database}?useSSL=false&amp;cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}" />
22+
<property name="cloudsql" value="jdbc:mysql://google/${database}?useSSL=false&amp;cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}" />
2523
</system-properties>
2624
</appengine-web-app>
2725
<!-- [END config] -->

0 commit comments

Comments
 (0)