Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All @@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand Down Expand Up @@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand Down Expand Up @@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All @@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand Down Expand Up @@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand Down Expand Up @@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All @@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand Down Expand Up @@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand Down Expand Up @@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All @@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand Down Expand Up @@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All @@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand Down Expand Up @@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand Down Expand Up @@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand Down Expand Up @@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All @@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand Down Expand Up @@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All @@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All @@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All @@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All @@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All @@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All @@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>