Skip to content

Commit 72727f8

Browse files
frankynfrankyn
authored
Merge branch 'master' into endpoints-region-tags
2 parents 0d5d0b1 + 0ab44c6 commit 72727f8

File tree

51 files changed

+1476
-142
lines changed

Some content is hidden

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

51 files changed

+1476
-142
lines changed

‎appengine-java8/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
34+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3535
</properties>
3636

3737
<dependencies>

‎appengine-java8/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
3434
</properties>
3535

3636
<dependencies>

‎appengine-java8/cloudsql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.57</version>
52+
<version>1.9.58</version>
5353
</dependency>
5454

5555
<dependency>

‎appengine-java8/endpoints-v2-backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.appengine</groupId>
5757
<artifactId>appengine-api-1.0-sdk</artifactId>
58-
<version>1.9.57</version>
58+
<version>1.9.58</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>javax.servlet</groupId>

‎appengine-java8/endpoints-v2-guice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.appengine</groupId>
6262
<artifactId>appengine-api-1.0-sdk</artifactId>
63-
<version>1.9.57</version>
63+
<version>1.9.58</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>javax.servlet</groupId>

‎appengine-java8/endpoints-v2-migration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ limitations under the License.
4747
<dependency>
4848
<groupId>com.google.appengine</groupId>
4949
<artifactId>appengine-api-1.0-sdk</artifactId>
50-
<version>1.9.57</version>
50+
<version>1.9.58</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>javax.servlet</groupId>

‎appengine-java8/images/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Copyright 2015 Google Inc.
2121
<artifactId>appengine-images-j8</artifactId>
2222

2323
<properties>
24-
<appengine.sdk.version>1.9.57</appengine.sdk.version>
24+
<appengine.sdk.version>1.9.58</appengine.sdk.version>
2525
</properties>
2626

2727
<parent>

‎appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.appengine.api.images.Image;
2323
import com.google.appengine.api.images.ImagesService;
2424
import com.google.appengine.api.images.ImagesServiceFactory;
25+
import com.google.appengine.api.images.ServingUrlOptions;
2526
import com.google.appengine.api.images.Transform;
2627
import com.google.appengine.tools.cloudstorage.GcsFileOptions;
2728
import com.google.appengine.tools.cloudstorage.GcsFilename;
@@ -108,6 +109,16 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
108109
ByteBuffer.wrap(rotatedImage.getImageData()));
109110
//[END rotate]
110111

112+
// [START servingUrl]
113+
// Create a fixed dedicated URL that points to the GCS hosted file
114+
ServingUrlOptions options = ServingUrlOptions.Builder
115+
.withGoogleStorageFileName("/gs/" + bucket + "/image.jpeg")
116+
.imageSize(150)
117+
.crop(true)
118+
.secureUrl(true);
119+
String url = imagesService.getServingUrl(options);
120+
// [END servingUrl]
121+
111122
// Output some simple HTML to display the images we wrote to Cloud Storage
112123
// in the browser.
113124
PrintWriter out = resp.getWriter();
@@ -118,6 +129,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
118129
+ "/resizedImage.jpeg' alt='AppEngine logo resized' />");
119130
out.println("<img src='//storage.cloud.google.com/" + bucket
120131
+ "/rotatedImage.jpeg' alt='AppEngine logo rotated' />");
132+
out.println("<img src='" + url + "' alt='Hosted logo' />");
121133
out.println("</body></html>\n");
122134
}
123135
}

‎appengine-java8/postgres/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.57</version>
52+
<version>1.9.58</version>
5353
</dependency>
5454

5555
<dependency>

‎appengine-java8/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.google.appengine</groupId>
5050
<artifactId>appengine-api-1.0-sdk</artifactId>
51-
<version>1.9.57</version>
51+
<version>1.9.58</version>
5252
</dependency>
5353
</dependencies>
5454

0 commit comments

Comments
 (0)