+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml
index 8b44668c4d1..298c4c728cf 100644
--- a/appengine/analytics/pom.xml
+++ b/appengine/analytics/pom.xml
@@ -20,13 +20,15 @@
+
[appid]: https://cloud.google.com/appengine/docs/java/appidentity/
[ae-docs]: https://cloud.google.com/appengine/docs/java/
diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index 68bca2aa360..17358c790bb 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -20,22 +20,26 @@
Please sign in.
"); - - return; - } - - Objectify ofy = ObjectifyService.ofy(); - Game game = null; - String userId = userService.getCurrentUser().getUserId(); - if (gameKey != null) { - game = ofy.load().type(Game.class).id(gameKey).safe(); - if (game.getUserO() == null && !userId.equals(game.getUserX())) { - game.setUserO(userId); - } - ofy.save().entity(game).now(); - } else { - game = new Game(userId, null, " ", true); - ofy.save().entity(game).now(); - gameKey = game.getId(); - } - - //[START channel_service] - ChannelService channelService = ChannelServiceFactory.getChannelService(); - - // The 'Game' object exposes a method which creates a unique string based on the game's key - // and the user's id. - String token = channelService.createChannel(game.getChannelKey(userId)); - - //[END channel_service] - - ofy.save().entity(game).now(); - - req.setAttribute("game_key", gameKey); - req.setAttribute("me", userId); - req.setAttribute("token", token); - req.setAttribute("initial_message", game.getMessageString()); - req.setAttribute("game_link", getGameUriWithGameParam(req, gameKey)); - getServletContext().getRequestDispatcher("/WEB-INF/view/index.jsp").forward(req, resp); - } -} diff --git a/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml deleted file mode 100644 index 93d1771b576..00000000000 --- a/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -
+
## Setup
Before you can run or deploy the sample, you will need to create a [Cloud SQL instance)](https://cloud.google.com/sql/docs/create-instance)
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
index 019e67d0afd..d7a706785a6 100644
--- a/appengine/cloudsql/pom.xml
+++ b/appengine/cloudsql/pom.xml
@@ -20,14 +20,17 @@
+
This directory contains Google Cloud Endpoints Frameworks for App Engine for
App Engine Standard samples. The [`backend/`](backend/) directory contains the
sample code for the [quickstart][4] for Cloud Endpoints Frameworks on App Engine
diff --git a/appengine/endpoints-frameworks-v2/backend/README.md b/appengine/endpoints-frameworks-v2/backend/README.md
index 9982f20e707..c7b197113e3 100644
--- a/appengine/endpoints-frameworks-v2/backend/README.md
+++ b/appengine/endpoints-frameworks-v2/backend/README.md
@@ -3,6 +3,10 @@
This sample demonstrates how to use Google Cloud Endpoints Frameworks using
Java on App Engine Standard.
+
+
+
+
## Build with Maven
### Adding the project ID to the sample API code
diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index 86290fd0877..b3d4f9aab5a 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -21,13 +21,17 @@
Note that name is specified and will override the default name of "{class name}.{method * name}". For example, the default is "echo.echo". * - * Note that httpMethod is not specified. This will default to a reasonable HTTP method + *
Note that httpMethod is not specified. This will default to a reasonable HTTP method * depending on the API method name. In this case, the HTTP method will default to POST. */ // [START echo_method] @@ -71,10 +71,10 @@ public Message echo(Message message, @Named("n") @Nullable Integer n) { * Echoes the received message back. If n is a non-negative integer, the message is copied that * many times in the returned message. * - * Note that name is specified and will override the default name of "{class name}.{method + *
Note that name is specified and will override the default name of "{class name}.{method * name}". For example, the default is "echo.echo". * - * Note that httpMethod is not specified. This will default to a reasonable HTTP method + *
Note that httpMethod is not specified. This will default to a reasonable HTTP method * depending on the API method name. In this case, the HTTP method will default to POST. */ // [START echo_path] @@ -88,10 +88,10 @@ public Message echoPathParameter(Message message, @Named("n") int n) { * Echoes the received message back. If n is a non-negative integer, the message is copied that * many times in the returned message. * - * Note that name is specified and will override the default name of "{class name}.{method + *
Note that name is specified and will override the default name of "{class name}.{method * name}". For example, the default is "echo.echo". * - * Note that httpMethod is not specified. This will default to a reasonable HTTP method + *
Note that httpMethod is not specified. This will default to a reasonable HTTP method * depending on the API method name. In this case, the HTTP method will default to POST. */ // [START echo_api_key] @@ -119,10 +119,10 @@ private Message doEcho(Message message, Integer n) { * Gets the authenticated user's email. If the user is not authenticated, this will return an HTTP * 401. * - * Note that name is not specified. This will default to "{class name}.{method name}". For + *
Note that name is not specified. This will default to "{class name}.{method name}". For * example, the default is "echo.getUserEmail". * - * Note that httpMethod is not required here. Without httpMethod, this will default to GET due + *
Note that httpMethod is not required here. Without httpMethod, this will default to GET due * to the API method name. httpMethod is added here for example purposes. */ // [START google_id_token_auth] @@ -147,10 +147,10 @@ public Email getUserEmail(User user) throws UnauthorizedException { * Gets the authenticated user's email. If the user is not authenticated, this will return an HTTP * 401. * - * Note that name is not specified. This will default to "{class name}.{method name}". For + *
Note that name is not specified. This will default to "{class name}.{method name}". For * example, the default is "echo.getUserEmail". * - * Note that httpMethod is not required here. Without httpMethod, this will default to GET due + *
Note that httpMethod is not required here. Without httpMethod, this will default to GET due
* to the API method name. httpMethod is added here for example purposes.
*/
// [START firebase_auth]
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java b/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java
index e7725a9d9cc..892c003bcaa 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2016 Google Inc.
+ * Copyright 2016 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java b/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java
index 64c043c8857..bcaa2967137 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2016 Google Inc.
+ * Copyright 2016 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
diff --git a/appengine/endpoints-frameworks-v2/guice-example/README.md b/appengine/endpoints-frameworks-v2/guice-example/README.md
index 25ed1d4d77c..d3e3c90a921 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/README.md
+++ b/appengine/endpoints-frameworks-v2/guice-example/README.md
@@ -3,6 +3,10 @@
This sample demonstrates how to use Google Cloud Endpoints Frameworks with Guice
on App Engine Standard.
+
+ Note that name is specified and will override the default name of "{class name}.{method
* name}". For example, the default is "echo.echo".
*
- * Note that httpMethod is not specified. This will default to a reasonable HTTP method
+ * Note that httpMethod is not specified. This will default to a reasonable HTTP method
* depending on the API method name. In this case, the HTTP method will default to POST.
*/
// [START echo_method]
@@ -71,10 +71,10 @@ public Message echo(Message message, @Named("n") @Nullable Integer n) {
* Echoes the received message back. If n is a non-negative integer, the message is copied that
* many times in the returned message.
*
- * Note that name is specified and will override the default name of "{class name}.{method
+ * Note that name is specified and will override the default name of "{class name}.{method
* name}". For example, the default is "echo.echo".
*
- * Note that httpMethod is not specified. This will default to a reasonable HTTP method
+ * Note that httpMethod is not specified. This will default to a reasonable HTTP method
* depending on the API method name. In this case, the HTTP method will default to POST.
*/
// [START echo_path]
@@ -88,10 +88,10 @@ public Message echoPathParameter(Message message, @Named("n") int n) {
* Echoes the received message back. If n is a non-negative integer, the message is copied that
* many times in the returned message.
*
- * Note that name is specified and will override the default name of "{class name}.{method
+ * Note that name is specified and will override the default name of "{class name}.{method
* name}". For example, the default is "echo.echo".
*
- * Note that httpMethod is not specified. This will default to a reasonable HTTP method
+ * Note that httpMethod is not specified. This will default to a reasonable HTTP method
* depending on the API method name. In this case, the HTTP method will default to POST.
*/
// [START echo_api_key]
@@ -119,10 +119,10 @@ private Message doEcho(Message message, Integer n) {
* Gets the authenticated user's email. If the user is not authenticated, this will return an HTTP
* 401.
*
- * Note that name is not specified. This will default to "{class name}.{method name}". For
+ * Note that name is not specified. This will default to "{class name}.{method name}". For
* example, the default is "echo.getUserEmail".
*
- * Note that httpMethod is not required here. Without httpMethod, this will default to GET due
+ * Note that httpMethod is not required here. Without httpMethod, this will default to GET due
* to the API method name. httpMethod is added here for example purposes.
*/
// [START google_id_token_auth]
@@ -147,10 +147,10 @@ public Email getUserEmail(User user) throws UnauthorizedException {
* Gets the authenticated user's email. If the user is not authenticated, this will return an HTTP
* 401.
*
- * Note that name is not specified. This will default to "{class name}.{method name}". For
+ * Note that name is not specified. This will default to "{class name}.{method name}". For
* example, the default is "echo.getUserEmail".
*
- * Note that httpMethod is not required here. Without httpMethod, this will default to GET due
+ * Note that httpMethod is not required here. Without httpMethod, this will default to GET due
* to the API method name. httpMethod is added here for example purposes.
*/
// [START firebase_auth]
diff --git a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoEndpointModule.java b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoEndpointModule.java
index a0b2cf7f005..3649d42e0c5 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoEndpointModule.java
+++ b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoEndpointModule.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2017 Google Inc.
+ * Copyright 2017 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
diff --git a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoGuiceListener.java b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoGuiceListener.java
index 7de3ed6546e..a8f2fafd696 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoGuiceListener.java
+++ b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoGuiceListener.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2017 Google Inc.
+ * Copyright 2017 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
@@ -22,9 +22,9 @@
// [START injector]
public class EchoGuiceListener extends GuiceServletContextListener {
- @Override
- protected Injector getInjector() {
- return Guice.createInjector(new EchoEndpointModule());
- }
+ @Override
+ protected Injector getInjector() {
+ return Guice.createInjector(new EchoEndpointModule());
+ }
}
// [END injector]
diff --git a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Email.java b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Email.java
index 2ecd4cf6a45..206c6c2f003 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Email.java
+++ b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Email.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2017 Google Inc.
+ * Copyright 2017 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
diff --git a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Message.java b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Message.java
index d5ddb79d430..c5334ecd89c 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Message.java
+++ b/appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/Message.java
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2017 Google Inc.
+ * Copyright 2017 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain a
- * copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.example.echo;
diff --git a/appengine/endpoints-frameworks-v2/migration-example/README.md b/appengine/endpoints-frameworks-v2/migration-example/README.md
index a213447c5b1..752c301cc85 100644
--- a/appengine/endpoints-frameworks-v2/migration-example/README.md
+++ b/appengine/endpoints-frameworks-v2/migration-example/README.md
@@ -1,5 +1,8 @@
# Hello World Google Cloud Endpoints for App Engine
+
+
+
+
## Build with Maven
### Adding the project ID to the sample API code
diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
index f0f8a768a55..5ffbe548e25 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml
+++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
@@ -21,13 +21,17 @@
+
This sample provides an example of a [migration][7] from the prior version of
[Google Cloud Endpoints Frameworks][3] to new
[Google Cloud Endpoints Frameworks for App Engine][8] using a
diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml
index 763a41a416c..d3271db15a7 100644
--- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml
+++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml
@@ -22,13 +22,17 @@ limitations under the License.
+
+
# DEPRECATED
### This sample uses endpoints v1 the preferred strategy for new development is to use Endpoints v2
diff --git a/appengine/endpoints-v1-helloworld/pom.xml b/appengine/endpoints-v1-helloworld/pom.xml
index f43b4910fd3..291610527c8 100644
--- a/appengine/endpoints-v1-helloworld/pom.xml
+++ b/appengine/endpoints-v1-helloworld/pom.xml
@@ -21,18 +21,19 @@
+
**Java 7 runtime support on App Engine standard was [deprecated](https://cloud.google.com/appengine/docs/deprecations/java7) on
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
index f8f368a03c9..150504980e7 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
@@ -20,18 +20,24 @@
**Java 7 runtime support on App Engine standard was [deprecated](https://cloud.google.com/appengine/docs/deprecations/java7) on
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml
index c6b573475f9..a3a0e3ebf1c 100644
--- a/appengine/firebase-tictactoe/pom.xml
+++ b/appengine/firebase-tictactoe/pom.xml
@@ -19,12 +19,22 @@
**Java 7 runtime support on App Engine standard was [deprecated](https://cloud.google.com/appengine/docs/deprecations/java7) on
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
diff --git a/appengine/gaeinfo/pom.xml b/appengine/gaeinfo/pom.xml
index 5d006eb7515..89bc1ff8356 100644
--- a/appengine/gaeinfo/pom.xml
+++ b/appengine/gaeinfo/pom.xml
@@ -21,13 +21,17 @@ Copyright 2017 Google Inc.
**Java 7 runtime support on App Engine standard was [deprecated](https://cloud.google.com/appengine/docs/deprecations/java7) on
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
diff --git a/appengine/guestbook-cloud-datastore/pom.xml b/appengine/guestbook-cloud-datastore/pom.xml
index 59b8dd6b236..dceb8f74530 100644
--- a/appengine/guestbook-cloud-datastore/pom.xml
+++ b/appengine/guestbook-cloud-datastore/pom.xml
@@ -22,17 +22,23 @@
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *
http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *
Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
//[START all]
+
package com.example.guestbook;
import static com.example.guestbook.Persistence.getDatastore;
@@ -54,7 +57,7 @@ public Greeting(String book, String content, String id, String email) {
}
public Greeting(Entity entity) {
- key = entity.hasKey() ? entity.getKey() : null;
+ key = entity.hasKey() ? entity.key() : null;
authorEmail = entity.contains("authorEmail") ? entity.getString("authorEmail") : null;
authorId = entity.contains("authorId") ? entity.getString("authorId") : null;
date = entity.contains("date") ? entity.getDateTime("date").toDate() : null;
@@ -66,7 +69,7 @@ public void save() {
key = getDatastore().allocateId(makeIncompleteKey()); // Give this greeting a unique ID
}
- Builder Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.guestbook;
import static com.example.guestbook.Persistence.getDatastore;
@@ -40,8 +43,7 @@ public class Guestbook {
public Guestbook(String book) {
this.book = book == null ? "default" : book;
- key =
- keyFactory.newKey(
+ key = keyFactory.newKey(
this.book); // There is a 1:1 mapping between Guestbook names and Guestbook objects
}
@@ -52,11 +54,11 @@ public Key getKey() {
public List Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.guestbook;
import com.google.cloud.datastore.Datastore;
@@ -25,8 +28,8 @@ public class Persistence {
public static Datastore getDatastore() {
if (datastore.get() == null) {
- datastore.set(DatastoreOptions.newBuilder().setProjectId("your-project-id-here")
- .build().getService());
+ datastore.set(DatastoreOptions.builder().projectId("your-project-id-here")
+ .build().service());
}
return datastore.get();
@@ -37,7 +40,7 @@ public static void setDatastore(Datastore datastore) {
}
public static KeyFactory getKeyFactory(Class c) {
- return getDatastore().newKeyFactory().setKind(c.getSimpleName());
+ return getDatastore().newKeyFactory().kind(c.getSimpleName());
}
}
//[END all]
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
index 2c95c5c3aee..623c85be110 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
@@ -1,18 +1,21 @@
-/**
+/*
* Copyright 2016 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
//[START all]
+
package com.example.guestbook;
import com.google.appengine.api.users.User;
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
index a91390569ad..9f476734a74 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
@@ -1,29 +1,31 @@
-/**
+/*
* Copyright 2016 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.guestbook;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.util.List;
-
@RunWith(JUnit4.class)
public class GreetingTest {
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
index 4a5435eafe7..6adc74bfc18 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
@@ -1,22 +1,28 @@
-/**
+/*
* Copyright 2016 Google Inc.
*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.guestbook;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -25,10 +31,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RunWith(JUnit4.class)
public class SignGuestbookServletTest {
private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
index 3780f0266f2..b23277eff8d 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.example.guestbook;
import static com.example.guestbook.Persistence.getDatastore;
@@ -8,7 +24,6 @@
import com.google.cloud.datastore.QueryResults;
import com.google.cloud.datastore.testing.LocalDatastoreHelper;
import com.google.common.collect.Lists;
-
import java.io.IOException;
import java.util.ArrayList;
@@ -18,7 +33,7 @@ public class TestUtils {
public static void startDatastore() {
try {
datastore.start();
- Persistence.setDatastore(datastore.getOptions().getService());
+ Persistence.setDatastore(datastore.options().service());
} catch (IOException | InterruptedException e) {
throw new RuntimeException(e);
}
@@ -35,7 +50,7 @@ public static void stopDatastore() {
public static void wipeDatastore() {
Datastore datastore = getDatastore();
- QueryResults
**Java 7 runtime support on App Engine standard was [deprecated](https://cloud.google.com/appengine/docs/deprecations/java7) on
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
diff --git a/appengine/guestbook-objectify/pom.xml b/appengine/guestbook-objectify/pom.xml
index b73a555dbbe..57eac1e820f 100644
--- a/appengine/guestbook-objectify/pom.xml
+++ b/appengine/guestbook-objectify/pom.xml
@@ -25,12 +25,18 @@
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to deploy an application on Google App Engine.
diff --git a/appengine/helloworld-new-plugins/pom.xml b/appengine/helloworld-new-plugins/pom.xml
index f93373bc84b..5251719fbb8 100644
--- a/appengine/helloworld-new-plugins/pom.xml
+++ b/appengine/helloworld-new-plugins/pom.xml
@@ -28,11 +28,14 @@ Copyright 2015 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to deploy an application on Google App Engine.
diff --git a/appengine/helloworld/pom.xml b/appengine/helloworld/pom.xml
index 10dbb193de0..6710877dacf 100644
--- a/appengine/helloworld/pom.xml
+++ b/appengine/helloworld/pom.xml
@@ -20,12 +20,17 @@ Copyright 2015 Google Inc.
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use the [Cloud Identity-Aware Proxy][iap-docs] on [Google App
diff --git a/appengine/iap/pom.xml b/appengine/iap/pom.xml
index 15b6cd930d8..20912e49027 100644
--- a/appengine/iap/pom.xml
+++ b/appengine/iap/pom.xml
@@ -20,12 +20,16 @@ Copyright 2017 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *
http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *
Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.example.appengine.iap;
import java.io.IOException;
diff --git a/appengine/images/README.md b/appengine/images/README.md
index a3b66bfaab3..16b925a22a1 100644
--- a/appengine/images/README.md
+++ b/appengine/images/README.md
@@ -4,6 +4,10 @@
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
[Java 8 Runtime Environment](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).**
+
+
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use the Images Java API.
diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml
index d5c2561ed89..a2a3af88287 100644
--- a/appengine/images/pom.xml
+++ b/appengine/images/pom.xml
@@ -24,11 +24,14 @@ Copyright 2015 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use the [Logs API][log-docs] on [Google App
diff --git a/appengine/logs/pom.xml b/appengine/logs/pom.xml
index e0b2a86518c..6e72e2fc34c 100644
--- a/appengine/logs/pom.xml
+++ b/appengine/logs/pom.xml
@@ -20,18 +20,22 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [JavaMail][javamail-api] on [Google App Engine
diff --git a/appengine/mail/pom.xml b/appengine/mail/pom.xml
index a1e5b964c7c..ce223d5c528 100644
--- a/appengine/mail/pom.xml
+++ b/appengine/mail/pom.xml
@@ -20,24 +20,28 @@ Copyright 2016 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [Mailgun][mailgun-api] on [Google App Engine
diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml
index afdb72a5a76..685c242aec2 100644
--- a/appengine/mailgun/pom.xml
+++ b/appengine/mailgun/pom.xml
@@ -19,12 +19,22 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [Mailjet](https://www.mailjet.com/) on Google Managed VMs to
diff --git a/appengine/mailjet/pom.xml b/appengine/mailjet/pom.xml
index 06bec4e634b..7bdbdaabb9b 100644
--- a/appengine/mailjet/pom.xml
+++ b/appengine/mailjet/pom.xml
@@ -19,15 +19,23 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
Shows the usage of the Namespaces API.
diff --git a/appengine/multitenancy/pom.xml b/appengine/multitenancy/pom.xml
index 512f5274a4b..d53a17e9610 100644
--- a/appengine/multitenancy/pom.xml
+++ b/appengine/multitenancy/pom.xml
@@ -23,16 +23,22 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
## Oauth2 Sample
diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml
index 024dab38fa9..3dafb06e47d 100644
--- a/appengine/oauth2/pom.xml
+++ b/appengine/oauth2/pom.xml
@@ -20,18 +20,27 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use the [Pusher][pusher] on [Google App Engine][ae-docs].
diff --git a/appengine/pusher-chat/pom.xml b/appengine/pusher-chat/pom.xml
index 7abe9b57ac7..7ca23787fae 100644
--- a/appengine/pusher-chat/pom.xml
+++ b/appengine/pusher-chat/pom.xml
@@ -20,13 +20,17 @@ Copyright 2017 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to access App Engine Standard Environment APIs remotely,
diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml
index b2d55b838ce..c46bf15b12a 100644
--- a/appengine/remote/remote-client/pom.xml
+++ b/appengine/remote/remote-client/pom.xml
@@ -20,31 +20,40 @@
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample provides Java code samples in support of the "Handling Requests" description [Requests][requests-doc] on [Google App
diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml
index d3d2a83df56..c684fd4979d 100644
--- a/appengine/requests/pom.xml
+++ b/appengine/requests/pom.xml
@@ -20,18 +20,27 @@ Copyright 2016 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use App Engine Search API.
diff --git a/appengine/search/pom.xml b/appengine/search/pom.xml
index 922dca46fa7..4aaf6a72d5f 100644
--- a/appengine/search/pom.xml
+++ b/appengine/search/pom.xml
@@ -19,17 +19,22 @@ Copyright 2015 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on
diff --git a/appengine/sendgrid/pom.xml b/appengine/sendgrid/pom.xml
index f25ad2b7d97..0c98066b169 100644
--- a/appengine/sendgrid/pom.xml
+++ b/appengine/sendgrid/pom.xml
@@ -20,11 +20,14 @@ Copyright 2015 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample displays what's going on in your app. It dumps the environment and lots more.
diff --git a/appengine/sockets/README_LIBS.md b/appengine/sockets/README_LIBS.md
index 168f8c36d73..1faa8e0136c 100644
--- a/appengine/sockets/README_LIBS.md
+++ b/appengine/sockets/README_LIBS.md
@@ -5,6 +5,9 @@
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
[Java 8 Runtime Environment](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).**
+
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
## Using the Socket API with JavaPNS
diff --git a/appengine/sockets/pom.xml b/appengine/sockets/pom.xml
index 4989d2d3c8f..4bf6f5d9f6c 100755
--- a/appengine/sockets/pom.xml
+++ b/appengine/sockets/pom.xml
@@ -26,12 +26,14 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
## Sample guestbook for use with App Engine Java.
diff --git a/appengine/taskqueue/defer-samples/pom.xml b/appengine/taskqueue/defer-samples/pom.xml
index ee9233b6199..9940f94dbcc 100644
--- a/appengine/taskqueue/defer-samples/pom.xml
+++ b/appengine/taskqueue/defer-samples/pom.xml
@@ -20,20 +20,19 @@
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [pull task queues][appid] on [Google App
diff --git a/appengine/taskqueue/pull-samples/pom.xml b/appengine/taskqueue/pull-samples/pom.xml
index e5ec216253d..174bf1e96bb 100644
--- a/appengine/taskqueue/pull-samples/pom.xml
+++ b/appengine/taskqueue/pull-samples/pom.xml
@@ -22,18 +22,27 @@ Copyright 2016 Google Inc.
+
+
[taskqueue-api]: https://cloud.google.com/appengine/docs/java/javadoc/com/google/appengine/api/taskqueue/package-summary
[ae-docs]: https://cloud.google.com/appengine/docs/java/
diff --git a/appengine/taskqueue/push-samples/pom.xml b/appengine/taskqueue/push-samples/pom.xml
index db3fcf76d63..32edf54fbdf 100644
--- a/appengine/taskqueue/push-samples/pom.xml
+++ b/appengine/taskqueue/push-samples/pom.xml
@@ -20,14 +20,22 @@ Copyright 2016 Google Inc.
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google
diff --git a/appengine/twilio/pom.xml b/appengine/twilio/pom.xml
index 4f79a933d01..7263dee6c2a 100644
--- a/appengine/twilio/pom.xml
+++ b/appengine/twilio/pom.xml
@@ -20,13 +20,21 @@ Copyright 2015 Google Inc.
+
+
Samples for the Java 8 runtime can be found [here](/appengine-java8).
This sample demonstrates how to deploy an application on Google App Engine.
diff --git a/appengine/urlfetch/pom.xml b/appengine/urlfetch/pom.xml
index 9b2b484d84a..4063dd3f92d 100644
--- a/appengine/urlfetch/pom.xml
+++ b/appengine/urlfetch/pom.xml
@@ -20,13 +20,21 @@ Copyright 2015 Google Inc.
Please sign in.
"); + + userService.createLoginURL(thisUrl) + + "\">sign in."); } } } diff --git a/appengine/users/src/main/webapp/WEB-INF/web.xml b/appengine/users/src/main/webapp/WEB-INF/web.xml index 4b2b77234dc..7b67107c3cb 100644 --- a/appengine/users/src/main/webapp/WEB-INF/web.xml +++ b/appengine/users/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ -Please .
"); + .contains("sign in."); } @Test @@ -104,6 +106,6 @@ public void doGet_userLoggedIn_writesResponse() throws Exception { .contains("Hello, " + FAKE_NAME + "!"); assertThat(responseWriter.toString()) .named("UsersServlet response") - .contains("sign out"); + .contains("sign out"); } }