Skip to content

Commit 9a2b0e7

Browse files
tswasttswast
committed
Merge branch 'master' of ssh://github.com/GoogleCloudPlatform/java-docs-samples into appidentity
2 parents abdf69a + 9747002 commit 9a2b0e7

File tree

103 files changed

+934
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+934
-819
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ env:
66
before_install:
77
- openssl aes-256-cbc -K $encrypted_99d8b304f94b_key -iv $encrypted_99d8b304f94b_iv -in service-account.json.enc -out service-account.json -d
88

9-
script: mvn test
9+
script: mvn verify
1010
after_success:
1111
- mvn clean cobertura:cobertura coveralls:report

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎appengine/appidentity/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
2020
<packaging>war</packaging>
2121
<version>1.0-SNAPSHOT</version>
2222
<groupId>com.example.appengine</groupId>
23-
<artifactId>appidentity</artifactId>
23+
<artifactId>appengine-appidentity</artifactId>
2424

2525
<properties>
2626
<appengine.target.version>1.9.30</appengine.target.version>
@@ -107,6 +107,20 @@ Copyright 2015 Google Inc. All Rights Reserved.
107107
<artifactId>gcloud-maven-plugin</artifactId>
108108
<version>2.0.9.90.v20151210</version>
109109
</plugin>
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-checkstyle-plugin</artifactId>
113+
<version>2.17</version>
114+
<configuration>
115+
<configLocation>../../google-checks.xml</configLocation>
116+
<consoleOutput>true</consoleOutput>
117+
<failOnViolation>true</failOnViolation>
118+
<failsOnError>true</failsOnError>
119+
</configuration>
120+
<executions>
121+
<execution><goals><goal>check</goal></goals></execution>
122+
</executions>
123+
</plugin>
110124
</plugins>
111125
</build>
112126
</project>

‎appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
package com.example.appengine.appidentity;
1818

1919
import com.google.apphosting.api.ApiProxy;
20-
import com.google.apphosting.api.ApiProxy.Environment;
2120

2221
import java.io.IOException;
23-
import java.io.PrintWriter;
2422

2523
import javax.servlet.http.HttpServlet;
2624
import javax.servlet.http.HttpServletRequest;

‎appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public String createShortUrl(String longUrl) throws Exception {
6363
// Note: Should check the content-encoding.
6464
// Any JSON parser can be used; this one is used for illustrative purposes.
6565
JSONTokener responseTokens = new JSONTokener(connection.getInputStream());
66-
JSONObject response = new JSONObject(response_tokens);
66+
JSONObject response = new JSONObject(responseTokens);
6767
return (String) response.get("id");
6868
} else {
6969
try (InputStream s = connection.getErrorStream();

‎appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
6161
} catch (Exception e) {
6262
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
6363
writer.println("error shortening URL: " + longUrl);
64-
e.printStackTrace(w);
64+
e.printStackTrace(writer);
6565
return;
6666
}
6767

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎appengine/disk/pom.xml

Lines changed: 0 additions & 46 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎appengine/extending-runtime/pom.xml

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎appengine/extending-runtime/src/main/webapp/Dockerfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎appengine/extending-runtime/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎appengine/helloworld-mvm/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎appengine/helloworld-mvm/pom.xml

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎appengine/helloworld-mvm/src/main/java/com/example/appengine/helloworld/HelloServlet.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎appengine/helloworld-mvm/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎appengine/helloworld-mvm/src/main/webapp/WEB-INF/web.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)