");
-
- 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 9a27ea3b10c..00000000000
--- a/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- YOUR-PROJECTID-HERE
- 1
- true
-
-
-
-
-
-
-
-
- channel_presence
-
-
-
-
diff --git a/appengine/channel/src/main/webapp/WEB-INF/logging.properties b/appengine/channel/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index f36a2ec76e0..00000000000
--- a/appengine/channel/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-#
-# A default java.util.logging configuration.
-# (All App Engine logging is through java.util.logging by default).
-#
-# To use this configuration, copy it into your application's WEB-INF
-# folder and add the following to your appengine-web.xml:
-#
-#
-#
-#
-#
-# Set the default logging level for all loggers to WARNING
-.level=WARNING
diff --git a/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp b/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp
deleted file mode 100644
index af33d85b7f9..00000000000
--- a/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp
+++ /dev/null
@@ -1,276 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%--
- Copyright 2015 Google Inc. All Rights Reserved.
-
- 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.
---%>
-
-
-
-
-
-
-
-
-
-
Channel-based Tic Tac Toe
-
- Waiting for another player to join.
- Send them this link to play:
-
-
-
diff --git a/appengine/channel/src/main/webapp/WEB-INF/web.xml b/appengine/channel/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ea2d3e72f10..00000000000
--- a/appengine/channel/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
- TicTacToeServlet
- com.example.appengine.channel.TicTacToeServlet
-
-
- TicTacToeServlet
- /
-
-
- OpenedServlet
- com.example.appengine.channel.OpenedServlet
-
-
- OpenedServlet
- /opened
-
-
- MoveServlet
- com.example.appengine.channel.MoveServlet
-
-
- MoveServlet
- /move
-
-
- ChannelPresenceServlet
- com.example.appengine.channel.ChannelPresenceServlet
-
-
- ChannelPresenceServlet
- /_ah/channel/connected/
-
-
- ChannelPresenceServlet
- /_ah/channel/disconnected/
-
-
-
- ObjectifyFilter
- com.googlecode.objectify.ObjectifyFilter
-
-
- ObjectifyFilter
- /*
-
-
- com.example.appengine.channel.OfyHelper
-
-
diff --git a/appengine/cloudsql/README.md b/appengine/cloudsql/README.md
deleted file mode 100644
index bf8dbb101a5..00000000000
--- a/appengine/cloudsql/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Cloud SQL sample for Google App Engine
-This sample demonstrates how to use [Cloud SQL](https://cloud.google.com/sql/) on Google App Engine
-## 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)
-1. Create a new user and database for the application. The easiest way to do this is via the [Google Developers Console](https://console.developers.google.com/project/_/sql/instances/example-instance2/access-control/users). Alternatively, you can use MySQL tools such as the command line client or workbench.
-## Running locally
-1. You will need to be running a local instance of MySQL.
-1. Update the connection string in ``appengine-web.xml`` with your local MySQL instance values.
- `$ mvn clean appengine:devserver`
-
-## Deploying
-1. Update the connection string in ``appengine-web.xml`` with your Cloud SQL instance values.
- `$ mvn clean appengine:update`
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
deleted file mode 100644
index f1137faf70d..00000000000
--- a/appengine/cloudsql/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-cloudsql
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- com.google.cloud.sql
- mysql-socket-factory
- 1.0.1
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- mysql
- mysql-connector-java
- 6.0.3
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java b/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
deleted file mode 100644
index ecd2c69f59e..00000000000
--- a/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.cloudsql;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class CloudSqlServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String path = req.getRequestURI();
- if (path.startsWith("/favicon.ico")) {
- return; // ignore the request for favicon.ico
- }
- // store only the first two octets of a users ip address
- String userIp = req.getRemoteAddr();
- InetAddress address = InetAddress.getByName(userIp);
- if (address instanceof Inet6Address) {
- // nest indexOf calls to find the second occurrence of a character in a string
- // an alternative is to use Apache Commons Lang: StringUtils.ordinalIndexOf()
- userIp = userIp.substring(0, userIp.indexOf(":", userIp.indexOf(":") + 1)) + ":*:*:*:*:*:*";
- } else if (address instanceof Inet4Address) {
- userIp = userIp.substring(0, userIp.indexOf(".", userIp.indexOf(".") + 1)) + ".*.*";
- }
-
- final String createTableSql = "CREATE TABLE IF NOT EXISTS visits ( visit_id INT NOT NULL "
- + "AUTO_INCREMENT, user_ip VARCHAR(46) NOT NULL, timestamp DATETIME NOT NULL, "
- + "PRIMARY KEY (visit_id) )";
- final String createVisitSql = "INSERT INTO visits (user_ip, timestamp) VALUES (?, ?)";
- final String selectSql = "SELECT user_ip, timestamp FROM visits ORDER BY timestamp DESC "
- + "LIMIT 10";
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/plain");
- String url;
- if (System
- .getProperty("com.google.appengine.runtime.version").startsWith("Google App Engine/")) {
- // Check the System properties to determine if we are running on appengine or not
- // Google App Engine sets a few system properties that will reliably be present on a remote
- // instance.
- url = System.getProperty("ae-cloudsql.cloudsql-database-url");
- try {
- // Load the class that provides the new "jdbc:google:mysql://" prefix.
- Class.forName("com.mysql.jdbc.GoogleDriver");
- } catch (ClassNotFoundException e) {
- throw new ServletException("Error loading Google JDBC Driver", e);
- }
- } else {
- // Set the url with the local MySQL database connection url when running locally
- url = System.getProperty("ae-cloudsql.local-database-url");
- }
- try (Connection conn = DriverManager.getConnection(url);
- PreparedStatement statementCreateVisit = conn.prepareStatement(createVisitSql)) {
- conn.createStatement().executeUpdate(createTableSql);
- statementCreateVisit.setString(1, userIp);
- statementCreateVisit.setTimestamp(2, new Timestamp(new Date().getTime()));
- statementCreateVisit.executeUpdate();
-
- try (ResultSet rs = conn.prepareStatement(selectSql).executeQuery()) {
- out.print("Last 10 visits:\n");
- while (rs.next()) {
- String savedIp = rs.getString("user_ip");
- String timeStamp = rs.getString("timestamp");
- out.print("Time: " + timeStamp + " Addr: " + savedIp + "\n");
- }
- }
- } catch (SQLException e) {
- throw new ServletException("SQL error", e);
- }
- }
-}
-// [END example]
diff --git a/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index a801e60ea8a..00000000000
--- a/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
- true
-
-
-
-
-
-
diff --git a/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml b/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 05375810dc6..00000000000
--- a/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- cloudsql
- com.example.appengine.cloudsql.CloudSqlServlet
-
-
- cloudsql
- /
-
-
diff --git a/appengine/datastore/README.md b/appengine/datastore/README.md
deleted file mode 100644
index c55fa65edb4..00000000000
--- a/appengine/datastore/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Google Cloud Datastore Sample
-
-This sample demonstrates how to use [Google Cloud Datastore][java-datastore]
-from [Google App Engine standard environment][ae-docs].
-
-[java-datastore]: https://cloud.google.com/appengine/docs/java/datastore/
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-
-## Running locally
-
-This example uses the
-[App Engine Maven plugin](https://cloud.google.com/appengine/docs/java/tools/maven).
-To run this sample locally:
-
- $ mvn appengine:devserver
-
-To see the results of the sample application, open
-[localhost:8080](http://localhost:8080) in a web browser.
-
-
-## Deploying
-
-In the following command, replace YOUR-PROJECT-ID with your
-[Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber)
-and SOME-VERSION with a valid version number.
-
- $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
-
-
-## Setup
-
-To save your project settings so that you don't need to enter the
- parameters, you can:
-
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your project name.
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your version name.
-
-You will now be able to run
-
- $ mvn appengine:update
-
-without the need for any additional parameters.
-
diff --git a/appengine/datastore/geo/pom.xml b/appengine/datastore/geo/pom.xml
deleted file mode 100644
index c8aad9678d6..00000000000
--- a/appengine/datastore/geo/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-datastore-geo
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/datastore/geo/src/main/java/com/example/appengine/GeoServlet.java b/appengine/datastore/geo/src/main/java/com/example/appengine/GeoServlet.java
deleted file mode 100644
index 694e2107ef9..00000000000
--- a/appengine/datastore/geo/src/main/java/com/example/appengine/GeoServlet.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.GeoPt;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.api.datastore.Query.GeoRegion.Circle;
-import com.google.appengine.api.datastore.Query.GeoRegion.Rectangle;
-import com.google.appengine.api.datastore.Query.StContainsFilter;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A servlet to demonstrate the use of Cloud Datastore geospatial queries.
- */
-public class GeoServlet extends HttpServlet {
- static final String BRAND_PROPERTY = "brand";
- static final String LOCATION_PROPERTY = "location";
-
- static final String BRAND_PARAMETER = "brand";
- static final String LATITUDE_PARAMETER = "lat";
- static final String LONGITUDE_PARAMETER = "lon";
- static final String RADIUS_PARAMETER = "r";
-
- static final String BRAND_DEFAULT = "Ocean Ave Shell";
- static final String LATITUDE_DEFAULT = "37.7895873";
- static final String LONGITUDE_DEFAULT = "-122.3917317";
- static final String RADIUS_DEFAULT = "1000.0";
-
- // Number of meters (approximately) in 1 degree of latitude.
- // http://gis.stackexchange.com/a/2964
- private static final double DEGREE_METERS = 111111.0;
-
- private final DatastoreService datastore;
-
- public GeoServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- private static String getParameterOrDefault(
- HttpServletRequest req, String parameter, String defaultValue) {
- String value = req.getParameter(parameter);
- if (value == null || value.isEmpty()) {
- value = defaultValue;
- }
- return value;
- }
-
- private static GeoPt getOffsetPoint(
- GeoPt original, double latOffsetMeters, double lonOffsetMeters) {
- // Approximate the number of degrees to offset by meters.
- // http://gis.stackexchange.com/a/2964
- // How long (approximately) is one degree of longitude?
- double lonDegreeMeters = DEGREE_METERS * Math.cos(original.getLatitude());
- return new GeoPt(
- (float) (original.getLatitude() + latOffsetMeters / DEGREE_METERS),
- // This may cause errors if given points near the north or south pole.
- (float) (original.getLongitude() + lonOffsetMeters / lonDegreeMeters));
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- resp.setContentType("text/plain");
- resp.setCharacterEncoding("UTF-8");
- PrintWriter out = resp.getWriter();
-
- String brand = getParameterOrDefault(req, BRAND_PARAMETER, BRAND_DEFAULT);
- String latStr = getParameterOrDefault(req, LATITUDE_PARAMETER, LATITUDE_DEFAULT);
- String lonStr = getParameterOrDefault(req, LONGITUDE_PARAMETER, LONGITUDE_DEFAULT);
- String radiusStr = getParameterOrDefault(req, RADIUS_PARAMETER, RADIUS_DEFAULT);
-
- float latitude;
- float longitude;
- double r;
- try {
- latitude = Float.parseFloat(latStr);
- longitude = Float.parseFloat(lonStr);
- r = Double.parseDouble(radiusStr);
- } catch (IllegalArgumentException e) {
- resp.sendError(
- HttpServletResponse.SC_BAD_REQUEST, String.format("Got bad value: %s", e.getMessage()));
- return;
- }
-
- // Get lat/lon for rectangle.
- GeoPt c = new GeoPt(latitude, longitude);
- GeoPt ne = getOffsetPoint(c, r, r);
- float neLat = ne.getLatitude();
- float neLon = ne.getLongitude();
- GeoPt sw = getOffsetPoint(c, -1 * r, -1 * r);
- float swLat = sw.getLatitude();
- float swLon = sw.getLongitude();
-
- // [START geospatial_stcontainsfilter_examples]
- // Testing for containment within a circle
- GeoPt center = new GeoPt(latitude, longitude);
- double radius = r; // Value is in meters.
- Filter f1 = new StContainsFilter("location", new Circle(center, radius));
- Query q1 = new Query("GasStation").setFilter(f1);
-
- // Testing for containment within a rectangle
- GeoPt southwest = new GeoPt(swLat, swLon);
- GeoPt northeast = new GeoPt(neLat, neLon);
- Filter f2 = new StContainsFilter("location", new Rectangle(southwest, northeast));
- Query q2 = new Query("GasStation").setFilter(f2);
- // [END geospatial_stcontainsfilter_examples]
-
- List circleResults = datastore.prepare(q1).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d stations in %f meter radius circle.\n", circleResults.size(), radius);
- printStations(out, circleResults);
- out.println();
-
- List rectResults = datastore.prepare(q2).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d stations in rectangle.\n", rectResults.size());
- printStations(out, rectResults);
- out.println();
-
- List brandResults = getStationsWithBrand(center, radius, brand);
- out.printf("Got %d stations in circle with brand %s.\n", brandResults.size(), brand);
- printStations(out, brandResults);
- out.println();
- }
-
- private void printStations(PrintWriter out, List stations) {
- for (Entity station : stations) {
- GeoPt location = (GeoPt) station.getProperty(LOCATION_PROPERTY);
- out.printf(
- "%s: @%f, %f\n",
- (String) station.getProperty(BRAND_PROPERTY),
- location.getLatitude(),
- location.getLongitude());
- }
- }
-
- private List getStationsWithBrand(GeoPt center, double radius, String value) {
- // [START geospatial_containment_and_equality_combination]
- Filter f =
- CompositeFilterOperator.and(
- new StContainsFilter("location", new Circle(center, radius)),
- new FilterPredicate("brand", FilterOperator.EQUAL, value));
- // [END geospatial_containment_and_equality_combination]
- Query q = new Query("GasStation").setFilter(f);
- return datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
- }
-}
diff --git a/appengine/datastore/geo/src/main/java/com/example/appengine/StartupServlet.java b/appengine/datastore/geo/src/main/java/com/example/appengine/StartupServlet.java
deleted file mode 100644
index 3a60b032730..00000000000
--- a/appengine/datastore/geo/src/main/java/com/example/appengine/StartupServlet.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.GeoPt;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A startup handler to populate the datastore with example entities.
- */
-public class StartupServlet extends HttpServlet {
- static final String IS_POPULATED_ENTITY = "IsPopulated";
- static final String IS_POPULATED_KEY_NAME = "is-populated";
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- resp.setContentType("text/plain");
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Key isPopulatedKey = KeyFactory.createKey(IS_POPULATED_ENTITY, IS_POPULATED_KEY_NAME);
- boolean isAlreadyPopulated;
- try {
- datastore.get(isPopulatedKey);
- isAlreadyPopulated = true;
- } catch (EntityNotFoundException expected) {
- isAlreadyPopulated = false;
- }
- if (isAlreadyPopulated) {
- resp.getWriter().println("ok");
- return;
- }
-
- // [START create_entity_with_geopt_property]
- Entity station = new Entity("GasStation");
- station.setProperty("brand", "Ocean Ave Shell");
- station.setProperty("location", new GeoPt(37.7913156f, -122.3926051f));
- datastore.put(station);
- // [END create_entity_with_geopt_property]
-
- station = new Entity("GasStation");
- station.setProperty("brand", "Charge Point Charging Station");
- station.setProperty("location", new GeoPt(37.7909778f, -122.3929963f));
- datastore.put(station);
-
- station = new Entity("GasStation");
- station.setProperty("brand", "76");
- station.setProperty("location", new GeoPt(37.7860533f, -122.3940325f));
- datastore.put(station);
-
- datastore.put(new Entity(isPopulatedKey));
- resp.getWriter().println("ok");
- }
-}
diff --git a/appengine/datastore/geo/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/geo/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index e9d8b21cb8f..00000000000
--- a/appengine/datastore/geo/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/datastore/geo/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/geo/src/main/webapp/WEB-INF/datastore-indexes.xml
deleted file mode 100644
index 513b883ed78..00000000000
--- a/appengine/datastore/geo/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/appengine/datastore/geo/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/geo/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 12d26c6bcab..00000000000
--- a/appengine/datastore/geo/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- geo
- com.example.appengine.GeoServlet
-
-
- geo
- /
-
-
- startup
- com.example.appengine.StartupServlet
-
-
- startup
- /_ah/start
-
-
-
-
- profile
- /*
-
-
- CONFIDENTIAL
-
-
-
diff --git a/appengine/datastore/geo/src/test/java/com/example/appengine/GeoServletTest.java b/appengine/datastore/geo/src/test/java/com/example/appengine/GeoServletTest.java
deleted file mode 100644
index 770126036bc..00000000000
--- a/appengine/datastore/geo/src/test/java/com/example/appengine/GeoServletTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link GeoServlet}.
- */
-@RunWith(JUnit4.class)
-public class GeoServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private GeoServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new GeoServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesNoGasStations() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- assertThat(responseWriter.toString())
- .named("GeoServlet response")
- .contains("Got 0 stations");
- }
-
- @Test
- public void doGet_badRadius_returnsError() throws Exception {
- when(mockRequest.getParameter(GeoServlet.RADIUS_PARAMETER)).thenReturn("this-is-not-a-float");
-
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- verify(mockResponse).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString());
- }
-}
diff --git a/appengine/datastore/geo/src/test/java/com/example/appengine/StartupServletTest.java b/appengine/datastore/geo/src/test/java/com/example/appengine/StartupServletTest.java
deleted file mode 100644
index d9c91af0efb..00000000000
--- a/appengine/datastore/geo/src/test/java/com/example/appengine/StartupServletTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.GeoPt;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.api.datastore.Query.GeoRegion.Circle;
-import com.google.appengine.api.datastore.Query.StContainsFilter;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link StartupServlet}.
- */
-@RunWith(JUnit4.class)
-public class StartupServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- private StartupServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new StartupServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesOkay() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
- assertThat(responseWriter.toString()).named("StartupServlet response").isEqualTo("ok\n");
- }
-
- @Test
- public void doGet_emptyDatastore_writesGasStation() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- GeoPt center = new GeoPt(37.7895873f, -122.3917317f);
- double radius = 1000.0; // Radius in meters.
- String value = "Ocean Ave Shell";
- Filter f =
- CompositeFilterOperator.and(
- new StContainsFilter("location", new Circle(center, radius)),
- new FilterPredicate("brand", FilterOperator.EQUAL, value));
- Query q = new Query("GasStation").setFilter(f);
- Entity result = datastore.prepare(q).asSingleEntity();
- assertThat(result.getProperty("brand")).named("brand").isEqualTo("Ocean Ave Shell");
- }
-
- @Test
- public void doGet_alreadyPopulated_writesOkay() throws Exception {
- datastore.put(
- new Entity(StartupServlet.IS_POPULATED_ENTITY, StartupServlet.IS_POPULATED_KEY_NAME));
- servletUnderTest.doGet(mockRequest, mockResponse);
- assertThat(responseWriter.toString()).named("StartupServlet response").isEqualTo("ok\n");
- }
-}
diff --git a/appengine/datastore/indexes-exploding/pom.xml b/appengine/datastore/indexes-exploding/pom.xml
deleted file mode 100644
index c7798a1a994..00000000000
--- a/appengine/datastore/indexes-exploding/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-datastore-indexes-exploding
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
deleted file mode 100644
index dff4396b797..00000000000
--- a/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A servlet to demonstrate the use of Cloud Datastore indexes.
- */
-public class IndexesServlet extends HttpServlet {
- private final DatastoreService datastore;
-
- public IndexesServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- Query q =
- new Query("Widget")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("x", FilterOperator.EQUAL, 1),
- new FilterPredicate("y", FilterOperator.EQUAL, "red")))
- .addSort("date", Query.SortDirection.ASCENDING);
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
-
- PrintWriter out = resp.getWriter();
- out.printf("Got %d widgets.\n", results.size());
- }
-}
diff --git a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index e9d8b21cb8f..00000000000
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
deleted file mode 100644
index 52fb35e0520..00000000000
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 049fd7a05e7..00000000000
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- indexes-servlet
- com.example.appengine.IndexesServlet
-
-
- indexes-servlet
- /
-
-
-
-
- profile
- /*
-
-
- CONFIDENTIAL
-
-
-
diff --git a/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
deleted file mode 100644
index 451f2189d34..00000000000
--- a/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link IndexesServlet}.
- */
-@RunWith(JUnit4.class)
-public class IndexesServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private IndexesServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new IndexesServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- assertThat(responseWriter.toString())
- .named("IndexesServlet response")
- .isEqualTo("Got 0 widgets.\n");
- }
-
- @Test
- public void doGet_repeatedPropertyEntities_writesWidgets() throws Exception {
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- // [START exploding_index_example_3]
- Entity widget = new Entity("Widget");
- widget.setProperty("x", Arrays.asList(1, 2, 3, 4));
- widget.setProperty("y", Arrays.asList("red", "green", "blue"));
- widget.setProperty("date", new Date());
- datastore.put(widget);
- // [END exploding_index_example_3]
-
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- assertThat(responseWriter.toString())
- .named("IndexesServlet response")
- .isEqualTo("Got 1 widgets.\n");
- }
-}
diff --git a/appengine/datastore/indexes-perfect/pom.xml b/appengine/datastore/indexes-perfect/pom.xml
deleted file mode 100644
index b3d83f59a19..00000000000
--- a/appengine/datastore/indexes-perfect/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-datastore-indexes-perfect
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
deleted file mode 100644
index 0dbca3ce307..00000000000
--- a/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A servlet to demonstrate the use of Cloud Datastore indexes.
- */
-public class IndexesServlet extends HttpServlet {
- private final DatastoreService datastore;
-
- public IndexesServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- PrintWriter out = resp.getWriter();
- // These queries should all work with the same index.
- // [START queries_and_indexes_example_1]
- Query q1 =
- new Query("Person")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("lastName", FilterOperator.EQUAL, "Smith"),
- new FilterPredicate("height", FilterOperator.EQUAL, 72)))
- .addSort("height", Query.SortDirection.DESCENDING);
- // [END queries_and_indexes_example_1]
- List r1 = datastore.prepare(q1).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d results from query 1.\n", r1.size());
-
- // [START queries_and_indexes_example_2]
- Query q2 =
- new Query("Person")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("lastName", FilterOperator.EQUAL, "Jones"),
- new FilterPredicate("height", FilterOperator.EQUAL, 63)))
- .addSort("height", Query.SortDirection.DESCENDING);
- // [END queries_and_indexes_example_2]
- List r2 = datastore.prepare(q2).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d results from query 2.\n", r2.size());
-
- // [START queries_and_indexes_example_3]
- Query q3 =
- new Query("Person")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("lastName", FilterOperator.EQUAL, "Friedkin"),
- new FilterPredicate("firstName", FilterOperator.EQUAL, "Damian")))
- .addSort("height", Query.SortDirection.ASCENDING);
- // [END queries_and_indexes_example_3]
- List r3 = datastore.prepare(q3).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d results from query 3.\n", r3.size());
-
- // [START queries_and_indexes_example_4]
- Query q4 =
- new Query("Person")
- .setFilter(new FilterPredicate("lastName", FilterOperator.EQUAL, "Blair"))
- .addSort("firstName", Query.SortDirection.ASCENDING)
- .addSort("height", Query.SortDirection.ASCENDING);
- // [END queries_and_indexes_example_4]
- List r4 = datastore.prepare(q4).asList(FetchOptions.Builder.withDefaults());
- out.printf("Got %d results from query 4.\n", r4.size());
- }
-}
diff --git a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index e9d8b21cb8f..00000000000
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
deleted file mode 100644
index bb56fb4bf50..00000000000
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 049fd7a05e7..00000000000
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- indexes-servlet
- com.example.appengine.IndexesServlet
-
-
- indexes-servlet
- /
-
-
-
-
- profile
- /*
-
-
- CONFIDENTIAL
-
-
-
diff --git a/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
deleted file mode 100644
index e82f5b302ab..00000000000
--- a/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link IndexesServlet}.
- */
-@RunWith(JUnit4.class)
-public class IndexesServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private IndexesServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new IndexesServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- String response = responseWriter.toString();
- assertThat(response).contains("Got 0 results from query 1.");
- assertThat(response).contains("Got 0 results from query 2.");
- assertThat(response).contains("Got 0 results from query 3.");
- assertThat(response).contains("Got 0 results from query 4.");
- }
-}
diff --git a/appengine/datastore/indexes/pom.xml b/appengine/datastore/indexes/pom.xml
deleted file mode 100644
index 74ccaaabae8..00000000000
--- a/appengine/datastore/indexes/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-datastore-indexes
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
deleted file mode 100644
index 78605f64bf2..00000000000
--- a/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A servlet to demonstrate the use of Cloud Datastore indexes.
- */
-public class IndexesServlet extends HttpServlet {
- private final DatastoreService datastore;
-
- public IndexesServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- // [START exploding_index_example_1]
- Query q =
- new Query("Widget")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("x", FilterOperator.EQUAL, 1),
- new FilterPredicate("y", FilterOperator.EQUAL, 2)))
- .addSort("date", Query.SortDirection.ASCENDING);
- // [END exploding_index_example_1]
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
-
- PrintWriter out = resp.getWriter();
- out.printf("Got %d widgets.\n", results.size());
- }
-}
diff --git a/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index e9d8b21cb8f..00000000000
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
deleted file mode 100644
index 2c7be706846..00000000000
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 049fd7a05e7..00000000000
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- indexes-servlet
- com.example.appengine.IndexesServlet
-
-
- indexes-servlet
- /
-
-
-
-
- profile
- /*
-
-
- CONFIDENTIAL
-
-
-
diff --git a/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
deleted file mode 100644
index daf6e8f3821..00000000000
--- a/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link IndexesServlet}.
- */
-@RunWith(JUnit4.class)
-public class IndexesServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private IndexesServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new IndexesServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- assertThat(responseWriter.toString())
- .named("IndexesServlet response")
- .isEqualTo("Got 0 widgets.\n");
- }
-}
diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml
deleted file mode 100644
index 4c4a55607e8..00000000000
--- a/appengine/datastore/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-datastore
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- com.google.auto.value
- auto-value
- 1.2
- provided
-
-
- com.google.code.findbugs
- jsr305
- 3.0.1
-
-
-
- com.google.guava
- guava
- 19.0
-
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
- joda-time
- joda-time
- 2.9.4
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java
deleted file mode 100644
index a11707a8819..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.example.time.Clock;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.users.User;
-import com.google.appengine.api.users.UserService;
-import com.google.appengine.api.users.UserServiceFactory;
-import com.google.common.collect.ImmutableList;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * A log of notes left by users.
- *
- *
This is meant to be subclassed to demonstrate different storage structures in Datastore.
- */
-abstract class AbstractGuestbook {
- private final DatastoreService datastore;
- private final UserService userService;
- private final Clock clock;
-
- AbstractGuestbook(Clock clock) {
- this.datastore = DatastoreServiceFactory.getDatastoreService();
- this.userService = UserServiceFactory.getUserService();
- this.clock = clock;
- }
-
- /**
- * Appends a new greeting to the guestbook and returns the {@link Entity} that was created.
- */
- public Greeting appendGreeting(String content) {
- Greeting greeting =
- Greeting.create(
- createGreeting(
- datastore,
- userService.getCurrentUser(),
- clock.now().toDate(),
- content));
- return greeting;
- }
-
- /**
- * Write a greeting to Datastore.
- */
- protected abstract Entity createGreeting(
- DatastoreService datastore, User user, Date date, String content);
-
- /**
- * Return a list of the most recent greetings.
- */
- public List listGreetings() {
- ImmutableList.Builder greetings = ImmutableList.builder();
- for (Entity entity : listGreetingEntities(datastore)) {
- greetings.add(Greeting.create(entity));
- }
- return greetings.build();
- }
-
- /**
- * Return a list of the most recent greetings.
- */
- protected abstract List listGreetingEntities(DatastoreService datastore);
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java
deleted file mode 100644
index ba6f8c95ce9..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-abstract class AbstractGuestbookServlet extends HttpServlet {
- private final AbstractGuestbook guestbook;
-
- public AbstractGuestbookServlet(AbstractGuestbook guestbook) {
- this.guestbook = guestbook;
- }
-
- private void renderGuestbook(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- resp.setContentType("text/html");
- resp.setCharacterEncoding("UTF-8");
- req.setAttribute("greetings", guestbook.listGreetings());
- req.getRequestDispatcher("/guestbook.jsp").forward(req, resp);
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- renderGuestbook(req, resp);
- }
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws IOException, ServletException {
- String content = req.getParameter("content");
- if (content == null || content.isEmpty()) {
- resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "missing content");
- return;
- }
- guestbook.appendGreeting(content);
- renderGuestbook(req, resp);
- }
-}
-
diff --git a/appengine/datastore/src/main/java/com/example/appengine/Greeting.java b/appengine/datastore/src/main/java/com/example/appengine/Greeting.java
deleted file mode 100644
index ad083267f05..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/Greeting.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.users.User;
-import com.google.auto.value.AutoValue;
-import org.joda.time.Instant;
-
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-@AutoValue
-public abstract class Greeting {
- static Greeting create(Entity entity) {
- User user = (User) entity.getProperty("user");
- Instant date = new Instant((Date) entity.getProperty("date"));
- String content = (String) entity.getProperty("content");
- return new AutoValue_Greeting(user, date, content);
- }
-
- @Nullable
- public abstract User getUser();
-
- public abstract Instant getDate();
-
- public abstract String getContent();
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java b/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java
deleted file mode 100644
index 36649c958fc..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.example.time.Clock;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.users.User;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * A log of notes left by users.
- *
- *
This demonstrates the use of Google Cloud Datastore using the App Engine
- * APIs. See the
- * documentation
- * for more information.
- */
-class Guestbook extends AbstractGuestbook {
- Guestbook(Clock clock) {
- super(clock);
- }
-
- @Override
- protected Entity createGreeting(
- DatastoreService datastore, User user, Date date, String content) {
- // No parent key specified, so Greeting is a root entity.
- Entity greeting = new Entity("Greeting");
- greeting.setProperty("user", user);
- greeting.setProperty("date", date);
- greeting.setProperty("content", content);
-
- datastore.put(greeting);
- return greeting;
- }
-
- @Override
- protected List listGreetingEntities(DatastoreService datastore) {
- Query query =
- new Query("Greeting")
- .addSort("date", Query.SortDirection.DESCENDING);
- return datastore.prepare(query)
- .asList(FetchOptions.Builder.withLimit(10));
- }
-
-
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java
deleted file mode 100644
index 8c01d83cb09..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.example.time.SystemClock;
-
-public class GuestbookServlet extends AbstractGuestbookServlet {
- public GuestbookServlet() {
- super(new Guestbook(new SystemClock()));
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java
deleted file mode 100644
index 7c481556a81..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.example.time.Clock;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.users.User;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * A log of notes left by users.
- *
- *
This demonstrates the use of Google Cloud Datastore using the App Engine
- * APIs. See the
- * documentation
- * for more information.
- */
-class GuestbookStrong extends AbstractGuestbook {
- private final String guestbookName;
-
- GuestbookStrong(String guestbookName, Clock clock) {
- super(clock);
- this.guestbookName = guestbookName;
- }
-
- @Override
- protected Entity createGreeting(
- DatastoreService datastore, User user, Date date, String content) {
- // String guestbookName = "my guestbook"; -- Set elsewhere (injected to the constructor).
- Key guestbookKey = KeyFactory.createKey("Guestbook", guestbookName);
-
- // Place greeting in the same entity group as guestbook.
- Entity greeting = new Entity("Greeting", guestbookKey);
- greeting.setProperty("user", user);
- greeting.setProperty("date", date);
- greeting.setProperty("content", content);
-
- datastore.put(greeting);
- return greeting;
- }
-
- @Override
- protected List listGreetingEntities(DatastoreService datastore) {
- Key guestbookKey = KeyFactory.createKey("Guestbook", guestbookName);
- Query query =
- new Query("Greeting", guestbookKey)
- .setAncestor(guestbookKey)
- .addSort("date", Query.SortDirection.DESCENDING);
- return datastore.prepare(query)
- .asList(FetchOptions.Builder.withLimit(10));
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java
deleted file mode 100644
index 004584119fc..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.example.time.SystemClock;
-
-public class GuestbookStrongServlet extends AbstractGuestbookServlet {
- public static final String GUESTBOOK_ID = "my guestbook";
-
- public GuestbookStrongServlet() {
- super(new GuestbookStrong(GUESTBOOK_ID, new SystemClock()));
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java b/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java
deleted file mode 100644
index 2da95898980..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-// [START cursors]
-import com.google.appengine.api.datastore.Cursor;
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.SortDirection;
-import com.google.appengine.api.datastore.QueryResultList;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class ListPeopleServlet extends HttpServlet {
- static final int PAGE_SIZE = 15;
- private final DatastoreService datastore;
-
- public ListPeopleServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- FetchOptions fetchOptions = FetchOptions.Builder.withLimit(PAGE_SIZE);
-
- // If this servlet is passed a cursor parameter, let's use it.
- String startCursor = req.getParameter("cursor");
- if (startCursor != null) {
- fetchOptions.startCursor(Cursor.fromWebSafeString(startCursor));
- }
-
- Query q = new Query("Person").addSort("name", SortDirection.ASCENDING);
- PreparedQuery pq = datastore.prepare(q);
-
- QueryResultList results;
- try {
- results = pq.asQueryResultList(fetchOptions);
- } catch (IllegalArgumentException e) {
- // IllegalArgumentException happens when an invalid cursor is used.
- // A user could have manually entered a bad cursor in the URL or there
- // may have been an internal implementation detail change in App Engine.
- // Redirect to the page without the cursor parameter to show something
- // rather than an error.
- resp.sendRedirect("/people");
- return;
- }
-
- resp.setContentType("text/html");
- resp.setCharacterEncoding("UTF-8");
- PrintWriter w = resp.getWriter();
- w.println("");
- w.println("");
- w.println("Cloud Datastore Cursor Sample");
- w.println("
");
- for (Entity entity : results) {
- w.println("
" + entity.getProperty("name") + "
");
- }
- w.println("
");
-
- String cursorString = results.getCursor().toWebSafeString();
-
- // This servlet lives at '/people'.
- w.println("Next page");
- }
-}
-// [END cursors]
diff --git a/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java b/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java
deleted file mode 100644
index ffeff7d2d22..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.PropertyProjection;
-import com.google.appengine.api.datastore.Query;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Servlet to demonstrate use of Datastore projection queries.
- *
- *
See the
- * documentation
- * for using Datastore projection queries from the Google App Engine standard environment.
- */
-@SuppressWarnings("serial")
-public class ProjectionServlet extends HttpServlet {
- private static final String GUESTBOOK_ID = GuestbookStrongServlet.GUESTBOOK_ID;
- private final DatastoreService datastore;
-
- public ProjectionServlet() {
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- resp.setContentType("text/plain");
- resp.setCharacterEncoding("UTF-8");
- PrintWriter out = resp.getWriter();
- out.printf("Latest entries from guestbook: \n");
-
- Key guestbookKey = KeyFactory.createKey("Guestbook", GUESTBOOK_ID);
- Query query = new Query("Greeting", guestbookKey);
- addGuestbookProjections(query);
- printGuestbookEntries(datastore, query, out);
- }
-
- private void addGuestbookProjections(Query query) {
- query.addProjection(new PropertyProjection("content", String.class));
- query.addProjection(new PropertyProjection("date", Date.class));
- }
-
- private void printGuestbookEntries(DatastoreService datastore, Query query, PrintWriter out) {
- List guests = datastore.prepare(query).asList(FetchOptions.Builder.withLimit(5));
- for (Entity guest : guests) {
- String content = (String) guest.getProperty("content");
- Date stamp = (Date) guest.getProperty("date");
- out.printf("Message %s posted on %s.\n", content, stamp.toString());
- }
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java b/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java
deleted file mode 100644
index 03fe99b3ea9..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.common.collect.ImmutableList;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A startup handler to populate the datastore with example entities.
- */
-public class StartupServlet extends HttpServlet {
- static final String IS_POPULATED_ENTITY = "IsPopulated";
- static final String IS_POPULATED_KEY_NAME = "is-populated";
-
- private static final String PERSON_ENTITY = "Person";
- private static final String NAME_PROPERTY = "name";
- private static final ImmutableList US_PRESIDENTS =
- ImmutableList.builder()
- .add("George Washington")
- .add("John Adams")
- .add("Thomas Jefferson")
- .add("James Madison")
- .add("James Monroe")
- .add("John Quincy Adams")
- .add("Andrew Jackson")
- .add("Martin Van Buren")
- .add("William Henry Harrison")
- .add("John Tyler")
- .add("James K. Polk")
- .add("Zachary Taylor")
- .add("Millard Fillmore")
- .add("Franklin Pierce")
- .add("James Buchanan")
- .add("Abraham Lincoln")
- .add("Andrew Johnson")
- .add("Ulysses S. Grant")
- .add("Rutherford B. Hayes")
- .add("James A. Garfield")
- .add("Chester A. Arthur")
- .add("Grover Cleveland")
- .add("Benjamin Harrison")
- .add("Grover Cleveland")
- .add("William McKinley")
- .add("Theodore Roosevelt")
- .add("William Howard Taft")
- .add("Woodrow Wilson")
- .add("Warren G. Harding")
- .add("Calvin Coolidge")
- .add("Herbert Hoover")
- .add("Franklin D. Roosevelt")
- .add("Harry S. Truman")
- .add("Dwight D. Eisenhower")
- .add("John F. Kennedy")
- .add("Lyndon B. Johnson")
- .add("Richard Nixon")
- .add("Gerald Ford")
- .add("Jimmy Carter")
- .add("Ronald Reagan")
- .add("George H. W. Bush")
- .add("Bill Clinton")
- .add("George W. Bush")
- .add("Barack Obama")
- .build();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- resp.setContentType("text/plain");
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Key isPopulatedKey = KeyFactory.createKey(IS_POPULATED_ENTITY, IS_POPULATED_KEY_NAME);
- boolean isAlreadyPopulated;
- try {
- datastore.get(isPopulatedKey);
- isAlreadyPopulated = true;
- } catch (EntityNotFoundException expected) {
- isAlreadyPopulated = false;
- }
- if (isAlreadyPopulated) {
- resp.getWriter().println("ok");
- return;
- }
-
- ImmutableList.Builder people = ImmutableList.builder();
- for (String name : US_PRESIDENTS) {
- Entity person = new Entity(PERSON_ENTITY);
- person.setProperty(NAME_PROPERTY, name);
- people.add(person);
- }
- datastore.put(people.build());
- datastore.put(new Entity(isPopulatedKey));
- resp.getWriter().println("ok");
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java b/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java
deleted file mode 100644
index 0b3585fd7b9..00000000000
--- a/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.Query;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class StatsServlet extends HttpServlet {
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- // [START stat_example]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- Entity globalStat = datastore.prepare(new Query("__Stat_Total__")).asSingleEntity();
- Long totalBytes = (Long) globalStat.getProperty("bytes");
- Long totalEntities = (Long) globalStat.getProperty("count");
- // [END stat_example]
-
- resp.setContentType("text/plain");
- resp.setCharacterEncoding("UTF-8");
- PrintWriter w = resp.getWriter();
- w.printf("%d bytes\n%d entities\n", totalBytes, totalEntities);
- }
-}
-// [END cursors]
diff --git a/appengine/datastore/src/main/java/com/example/time/Clock.java b/appengine/datastore/src/main/java/com/example/time/Clock.java
deleted file mode 100644
index 60ee9a49d0c..00000000000
--- a/appengine/datastore/src/main/java/com/example/time/Clock.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.time;
-
-import org.joda.time.Instant;
-
-/**
- * Provides the current value of "now." To preserve testability, avoid all other libraries that
- * access the system clock (whether {@linkplain System#currentTimeMillis directly} or {@linkplain
- * org.joda.time.DateTime#DateTime() indirectly}).
- *
- *
In production, use the {@link SystemClock} implementation to return the "real" system time. In
- * tests, either use {@link com.example.time.testing.FakeClock}, or get an instance from a mocking
- * framework such as Mockito.
- */
-public interface Clock {
- /**
- * Returns the current, absolute time according to this clock.
- */
- Instant now();
-}
diff --git a/appengine/datastore/src/main/java/com/example/time/SystemClock.java b/appengine/datastore/src/main/java/com/example/time/SystemClock.java
deleted file mode 100644
index ecf15c34207..00000000000
--- a/appengine/datastore/src/main/java/com/example/time/SystemClock.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.time;
-
-import org.joda.time.Instant;
-
-/**
- * Clock implementation that returns the "real" system time.
- *
- *
This class exists so that we can use a fake implementation for unit
- * testing classes that need the current time value. See {@link Clock} for
- * general information about clocks.
- */
-public class SystemClock implements Clock {
- /**
- * Creates a new instance. All {@code SystemClock} instances function identically.
- */
- public SystemClock() {}
-
- @Override
- public Instant now() {
- return new Instant();
- }
-}
diff --git a/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java b/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java
deleted file mode 100644
index 5b05841e439..00000000000
--- a/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.time.testing;
-
-import com.example.time.Clock;
-
-import org.joda.time.Instant;
-import org.joda.time.ReadableDuration;
-import org.joda.time.ReadableInstant;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * A Clock that returns a fixed Instant value as the current clock time. The
- * fixed Instant is settable for testing. Test code should hold a reference to
- * the FakeClock, while code under test should hold a Clock reference.
- *
- *
The clock time can be incremented/decremented manually, with
- * {@link #incrementTime} and {@link #decrementTime} respectively.
- *
- *
The clock can also be configured so that the time is incremented whenever
- * {@link #now()} is called: see {@link #setAutoIncrementStep}.
- */
-public class FakeClock implements Clock {
- private static final Instant DEFAULT_TIME = new Instant(1000000000L);
- private final long baseTimeMs;
- private final AtomicLong fakeNowMs;
- private volatile long autoIncrementStepMs;
-
- /**
- * Creates a FakeClock instance initialized to an arbitrary constant.
- */
- public FakeClock() {
- this(DEFAULT_TIME);
- }
-
- /**
- * Creates a FakeClock instance initialized to the given time.
- */
- public FakeClock(ReadableInstant now) {
- baseTimeMs = now.getMillis();
- fakeNowMs = new AtomicLong(baseTimeMs);
- }
-
- /**
- * Sets the value of the underlying instance for testing purposes.
- *
- * @return this
- */
- public FakeClock setNow(ReadableInstant now) {
- fakeNowMs.set(now.getMillis());
- return this;
- }
-
- @Override
- public Instant now() {
- return getAndAdd(autoIncrementStepMs);
- }
-
- /**
- * Returns the current time without applying an auto increment, if configured.
- * The default behavior of {@link #now()} is the same as this method.
- */
- public Instant peek() {
- return new Instant(fakeNowMs.get());
- }
-
- /**
- * Reset the given clock back to the base time with which the FakeClock was
- * initially constructed.
- *
- * @return this
- */
- public FakeClock resetTime() {
- fakeNowMs.set(baseTimeMs);
- return this;
- }
-
- /**
- * Increments the clock time by the given duration.
- *
- * @param duration the duration to increment the clock time by
- * @return this
- */
- public FakeClock incrementTime(ReadableDuration duration) {
- incrementTime(duration.getMillis());
- return this;
- }
-
- /**
- * Increments the clock time by the given duration.
- *
- * @param durationMs the duration to increment the clock time by,
- * in milliseconds
- * @return this
- */
- public FakeClock incrementTime(long durationMs) {
- fakeNowMs.addAndGet(durationMs);
- return this;
- }
-
- /**
- * Decrements the clock time by the given duration.
- *
- * @param duration the duration to decrement the clock time by
- * @return this
- */
- public FakeClock decrementTime(ReadableDuration duration) {
- incrementTime(-duration.getMillis());
- return this;
- }
-
- /**
- * Decrements the clock time by the given duration.
- *
- * @param durationMs the duration to decrement the clock time by,
- * in milliseconds
- * @return this
- */
- public FakeClock decrementTime(long durationMs) {
- incrementTime(-durationMs);
- return this;
- }
-
- /**
- * Sets the increment applied to the clock whenever it is queried.
- * The increment is zero by default: the clock is left unchanged when queried.
- *
- * @param autoIncrementStep the new auto increment duration
- * @return this
- */
- public FakeClock setAutoIncrementStep(ReadableDuration autoIncrementStep) {
- setAutoIncrementStep(autoIncrementStep.getMillis());
- return this;
- }
-
- /**
- * Sets the increment applied to the clock whenever it is queried.
- * The increment is zero by default: the clock is left unchanged when queried.
- *
- * @param autoIncrementStepMs the new auto increment duration, in milliseconds
- * @return this
- */
- public FakeClock setAutoIncrementStep(long autoIncrementStepMs) {
- this.autoIncrementStepMs = autoIncrementStepMs;
- return this;
- }
-
- /**
- * Atomically adds the given value to the current time.
- *
- * @see AtomicLong#addAndGet
- *
- * @param durationMs the duration to add, in milliseconds
- * @return the updated current time
- */
- protected final Instant addAndGet(long durationMs) {
- return new Instant(fakeNowMs.addAndGet(durationMs));
- }
-
- /**
- * Atomically adds the given value to the current time.
- *
- * @see AtomicLong#getAndAdd
- *
- * @param durationMs the duration to add, in milliseconds
- * @return the previous time
- */
- protected final Instant getAndAdd(long durationMs) {
- return new Instant(fakeNowMs.getAndAdd(durationMs));
- }
-}
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index c322e7d016e..00000000000
--- a/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml
deleted file mode 100644
index 662ebb0c35e..00000000000
--- a/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index babf6d1eeb6..00000000000
--- a/appengine/datastore/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
- guestbook-strong
- com.example.appengine.GuestbookStrongServlet
-
-
- guestbook-strong
- /
-
-
- guestbook
- com.example.appengine.GuestbookServlet
-
-
- guestbook
- /guestbook
-
-
- people
- com.example.appengine.ListPeopleServlet
-
-
- people
- /people
-
-
- projection
- com.example.appengine.ProjectionServlet
-
-
- projection
- /projection
-
-
- stats
- com.example.appengine.StatsServlet
-
-
- stats
- /stats
-
-
-
-
- startup
- com.example.appengine.StartupServlet
-
-
- startup
- /_ah/start
-
-
-
-
- profile
- /*
-
-
- CONFIDENTIAL
-
-
- *
-
-
-
-
-
- profile
- /stats
-
-
- CONFIDENTIAL
-
-
- admin
-
-
-
diff --git a/appengine/datastore/src/main/webapp/guestbook.jsp b/appengine/datastore/src/main/webapp/guestbook.jsp
deleted file mode 100644
index 0be736e697e..00000000000
--- a/appengine/datastore/src/main/webapp/guestbook.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-
-
-
-
-
-
diff --git a/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java b/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java
deleted file mode 100644
index 769b229491e..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.EmbeddedEntity;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.KeyRange;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-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.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Unit tests to demonstrate App Engine Datastore entities.
- */
-@RunWith(JUnit4.class)
-public class EntitiesTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void kindExample_writesEntity() throws Exception {
- // [START kind_example]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Entity employee = new Entity("Employee", "asalieri");
- employee.setProperty("firstName", "Antonio");
- employee.setProperty("lastName", "Salieri");
- employee.setProperty("hireDate", new Date());
- employee.setProperty("attendedHrTraining", true);
-
- datastore.put(employee);
- // [END kind_example]
-
- Entity got = datastore.get(employee.getKey());
- assertThat((String) got.getProperty("firstName")).named("got.firstName").isEqualTo("Antonio");
- assertThat((String) got.getProperty("lastName")).named("got.lastName").isEqualTo("Salieri");
- assertThat((Date) got.getProperty("hireDate")).named("got.hireDate").isNotNull();
- assertThat((boolean) got.getProperty("attendedHrTraining"))
- .named("got.attendedHrTraining")
- .isTrue();
- }
-
- @Test
- public void identifiers_keyName_setsKeyName() throws Exception {
- // [START identifiers_1]
- Entity employee = new Entity("Employee", "asalieri");
- // [END identifiers_1]
- datastore.put(employee);
-
- assertThat(employee.getKey().getName()).named("key name").isEqualTo("asalieri");
- }
-
- @Test
- public void identifiers_autoId_setsUnallocatedId() throws Exception {
- KeyRange keys = datastore.allocateIds("Employee", 1);
- long usedId = keys.getStart().getId();
-
- // [START identifiers_2]
- Entity employee = new Entity("Employee");
- // [END identifiers_2]
- datastore.put(employee);
-
- assertThat(employee.getKey().getId()).named("key id").isNotEqualTo(usedId);
- }
-
- @Test
- public void parent_withinEntityConstructor_setsParent() throws Exception {
- // [START parent_1]
- Entity employee = new Entity("Employee");
- datastore.put(employee);
-
- Entity address = new Entity("Address", employee.getKey());
- datastore.put(address);
- // [END parent_1]
-
- assertThat(address.getParent()).named("address parent").isEqualTo(employee.getKey());
- }
-
- @Test
- public void parent_withKeyName_setsKeyName() throws Exception {
- Entity employee = new Entity("Employee");
- datastore.put(employee);
-
- // [START parent_2]
- Entity address = new Entity("Address", "addr1", employee.getKey());
- // [END parent_2]
- datastore.put(address);
-
- assertThat(address.getKey().getName()).named("address key name").isEqualTo("addr1");
- }
-
- @Test
- public void datastoreServiceFactory_returnsDatastoreService() throws Exception {
- // [START working_with_entities]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- // [END working_with_entities]
- assertThat(datastore).named("datastore").isNotNull();
- }
-
- @Test
- public void creatingAnEntity_withKeyName_writesEntity() throws Exception {
- // [START creating_an_entity_1]
- Entity employee = new Entity("Employee", "asalieri");
- // Set the entity properties.
- // ...
- datastore.put(employee);
- // [END creating_an_entity_1]
-
- assertThat(employee.getKey().getName()).named("employee key name").isEqualTo("asalieri");
- }
-
- private Key writeEmptyEmployee() {
- // [START creating_an_entity_2]
- Entity employee = new Entity("Employee");
- // Set the entity properties.
- // ...
- datastore.put(employee);
- // [END creating_an_entity_2]
- return employee.getKey();
- }
-
- @Test
- public void creatingAnEntity_withoutKeyName_writesEntity() throws Exception {
- Key employeeKey = writeEmptyEmployee();
- // [START retrieving_an_entity]
- // Key employeeKey = ...;
- Entity employee = datastore.get(employeeKey);
- // [END retrieving_an_entity]
-
- assertThat(employee.getKey().getId()).named("retrieved key ID").isEqualTo(employeeKey.getId());
- }
-
- @Test
- public void deletingAnEntity_deletesAnEntity() throws Exception {
- Entity employee = new Entity("Employee", "asalieri");
- datastore.put(employee);
-
- Key employeeKey = KeyFactory.createKey("Employee", "asalieri");
- // [START deleting_an_entity]
- // Key employeeKey = ...;
- datastore.delete(employeeKey);
- // [END deleting_an_entity]
-
- try {
- Entity got = datastore.get(employeeKey);
- fail("Expected EntityNotFoundException");
- } catch (EntityNotFoundException expected) {
- assertThat(expected.getKey().getName()).named("exception key name").isEqualTo("asalieri");
- }
- }
-
- @Test
- public void repeatedProperties_storesList() throws Exception {
- // [START repeated_properties]
- Entity employee = new Entity("Employee");
- ArrayList favoriteFruit = new ArrayList();
- favoriteFruit.add("Pear");
- favoriteFruit.add("Apple");
- employee.setProperty("favoriteFruit", favoriteFruit);
- datastore.put(employee);
-
- // Sometime later
- employee = datastore.get(employee.getKey());
- @SuppressWarnings("unchecked") // Cast can't verify generic type.
- ArrayList retrievedFruits = (ArrayList) employee.getProperty("favoriteFruit");
- // [END repeated_properties]
-
- assertThat(retrievedFruits).containsExactlyElementsIn(favoriteFruit).inOrder();
- }
-
- @Test
- public void embeddedEntity_fromEmbedded_embedsProperties() throws Exception {
- Entity employee = new Entity("Employee");
- // [START embedded_entities_1]
- // Entity employee = ...;
- EmbeddedEntity embeddedContactInfo = new EmbeddedEntity();
-
- embeddedContactInfo.setProperty("homeAddress", "123 Fake St, Made, UP 45678");
- embeddedContactInfo.setProperty("phoneNumber", "555-555-5555");
- embeddedContactInfo.setProperty("emailAddress", "test@example.com");
-
- employee.setProperty("contactInfo", embeddedContactInfo);
- // [END embedded_entities_1]
- datastore.put(employee);
-
- Entity gotEmployee = datastore.get(employee.getKey());
- EmbeddedEntity got = (EmbeddedEntity) gotEmployee.getProperty("contactInfo");
- assertThat((String) got.getProperty("homeAddress"))
- .named("got.homeAddress")
- .isEqualTo("123 Fake St, Made, UP 45678");
- }
-
- private Key putEmployeeWithContactInfo(Entity contactInfo) {
- Entity employee = new Entity("Employee");
- // [START embedded_entities_2]
- // Entity employee = ...;
- // Entity contactInfo = ...;
- EmbeddedEntity embeddedContactInfo = new EmbeddedEntity();
-
- embeddedContactInfo.setKey(contactInfo.getKey()); // Optional, used so we can recover original.
- embeddedContactInfo.setPropertiesFrom(contactInfo);
-
- employee.setProperty("contactInfo", embeddedContactInfo);
- // [END embedded_entities_2]
- datastore.put(employee);
- return employee.getKey();
- }
-
- @Test
- public void embeddedEntity_fromExisting_canRecover() throws Exception {
- Entity initialContactInfo = new Entity("Contact");
- initialContactInfo.setProperty("homeAddress", "123 Fake St, Made, UP 45678");
- initialContactInfo.setProperty("phoneNumber", "555-555-5555");
- initialContactInfo.setProperty("emailAddress", "test@example.com");
- datastore.put(initialContactInfo);
- Key employeeKey = putEmployeeWithContactInfo(initialContactInfo);
-
- // [START embedded_entities_3]
- Entity employee = datastore.get(employeeKey);
- EmbeddedEntity embeddedContactInfo = (EmbeddedEntity) employee.getProperty("contactInfo");
-
- Key infoKey = embeddedContactInfo.getKey();
- Entity contactInfo = new Entity(infoKey);
- contactInfo.setPropertiesFrom(embeddedContactInfo);
- // [END embedded_entities_3]
- datastore.put(contactInfo);
-
- Entity got = datastore.get(infoKey);
- assertThat(got.getKey()).isEqualTo(initialContactInfo.getKey());
- assertThat((String) got.getProperty("homeAddress"))
- .named("got.homeAddress")
- .isEqualTo("123 Fake St, Made, UP 45678");
- }
-
- @Test
- public void batchOperations_putsEntities() {
- // [START batch_operations]
- Entity employee1 = new Entity("Employee");
- Entity employee2 = new Entity("Employee");
- Entity employee3 = new Entity("Employee");
- // [START_EXCLUDE]
- employee1.setProperty("firstName", "Bill");
- employee2.setProperty("firstName", "Jane");
- employee3.setProperty("firstName", "Alex");
- // [END_EXCLUDE]
-
- List employees = Arrays.asList(employee1, employee2, employee3);
- datastore.put(employees);
- // [END batch_operations]
-
- Map got =
- datastore.get(Arrays.asList(employee1.getKey(), employee2.getKey(), employee3.getKey()));
- assertThat((String) got.get(employee1.getKey()).getProperty("firstName"))
- .named("employee1.firstName")
- .isEqualTo("Bill");
- assertThat((String) got.get(employee2.getKey()).getProperty("firstName"))
- .named("employee2.firstName")
- .isEqualTo("Jane");
- assertThat((String) got.get(employee3.getKey()).getProperty("firstName"))
- .named("employee3.firstName")
- .isEqualTo("Alex");
- }
-
- @Test
- public void createKey_makesKey() {
- // [START generating_keys_1]
- Key k1 = KeyFactory.createKey("Person", "GreatGrandpa");
- Key k2 = KeyFactory.createKey("Person", 74219);
- // [END generating_keys_1]
-
- assertThat(k1).isNotNull();
- assertThat(k2).isNotNull();
- }
-
- @Test
- public void keyFactoryBuilder_makeKeyWithParents() {
- Key greatKey = KeyFactory.createKey("Person", "GreatGrandpa");
- Key grandKey = KeyFactory.createKey(greatKey, "Person", "Grandpa");
- Key dadKey = KeyFactory.createKey(grandKey, "Person", "Dad");
- Key meKey = KeyFactory.createKey(dadKey, "Person", "Me");
-
- // [START generating_keys_2]
- Key k =
- new KeyFactory.Builder("Person", "GreatGrandpa")
- .addChild("Person", "Grandpa")
- .addChild("Person", "Dad")
- .addChild("Person", "Me")
- .getKey();
- // [END generating_keys_2]
-
- assertThat(k).isEqualTo(meKey);
- }
-
- @Test
- public void keyToString_getsPerson() throws Exception {
- Entity p = new Entity("Person");
- p.setProperty("relationship", "Me");
- datastore.put(p);
- Key k = p.getKey();
-
- // [START generating_keys_3]
- String personKeyStr = KeyFactory.keyToString(k);
-
- // Some time later (for example, after using personKeyStr in a link).
- Key personKey = KeyFactory.stringToKey(personKeyStr);
- Entity person = datastore.get(personKey);
- // [END generating_keys_3]
-
- assertThat(personKey).isEqualTo(k);
- assertThat((String) person.getProperty("relationship"))
- .named("person.relationship")
- .isEqualTo("Me");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java b/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
deleted file mode 100644
index abb845cacd4..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.example.time.testing.FakeClock;
-
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.appengine.tools.development.testing.LocalUserServiceTestConfig;
-import org.joda.time.Instant;
-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;
-
-/**
- * Unit tests for {@link GuestbookStrong}.
- */
-@RunWith(JUnit4.class)
-public class GuestbookStrongTest {
- private static final Instant FAKE_NOW = new Instant(1234567890L);
- private static final String GUESTBOOK_ID = "my guestbook";
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set maximum eventual consistency.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(100),
- // Make sure there is a user logged in. We enforce this in web.xml.
- new LocalUserServiceTestConfig())
- .setEnvIsLoggedIn(true)
- .setEnvEmail("test@example.com")
- .setEnvAuthDomain("gmail.com");
-
- private FakeClock clock;
- private GuestbookStrong guestbookUnderTest;
-
- @Before
- public void setUp() throws Exception {
- helper.setUp();
- clock = new FakeClock(FAKE_NOW);
- guestbookUnderTest = new GuestbookStrong(GUESTBOOK_ID, clock);
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void appendGreeting_normalData_setsContentProperty() {
- Greeting got = guestbookUnderTest.appendGreeting("Hello, Datastore!");
-
- assertThat(got.getContent())
- .named("content property")
- .isEqualTo("Hello, Datastore!");
- }
-
- @Test
- public void appendGreeting_normalData_setsDateProperty() {
- Greeting got = guestbookUnderTest.appendGreeting("Hello, Datastore!");
-
- assertThat(got.getDate())
- .named("date property")
- .isEqualTo(FAKE_NOW);
- }
-
- @Test
- public void listGreetings_maximumEventualConsistency_returnsAllGreetings() {
- // Arrange
- guestbookUnderTest.appendGreeting("Hello, Datastore!");
- guestbookUnderTest.appendGreeting("Hello, Eventual Consistency!");
- guestbookUnderTest.appendGreeting("Hello, World!");
-
- // Act
- List got = guestbookUnderTest.listGreetings();
-
- // Assert
- // Since we use an ancestor query, all greetings should be available.
- assertThat(got).hasSize(3);
- }
-}
-
diff --git a/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java b/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java
deleted file mode 100644
index bc9d1de4afd..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.example.time.testing.FakeClock;
-
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.dev.HighRepJobPolicy;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.appengine.tools.development.testing.LocalUserServiceTestConfig;
-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;
-
-/**
- * Unit tests for {@link Guestbook}.
- */
-@RunWith(JUnit4.class)
-public class GuestbookTest {
- private static final class CustomHighRepJobPolicy implements HighRepJobPolicy {
- static int newJobCounter = 0;
- static int existingJobCounter = 0;
-
- @Override
- public boolean shouldApplyNewJob(Key entityGroup) {
- // Every other new job fails to apply.
- return newJobCounter++ % 2 == 0;
- }
-
- @Override
- public boolean shouldRollForwardExistingJob(Key entityGroup) {
- // Existing jobs always apply after every Get and every Query.
- return true;
- }
- }
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set custom, deterministic, eventual consistency.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setAlternateHighRepJobPolicyClass(CustomHighRepJobPolicy.class),
- // Make sure there is a user logged in. We enforce this in web.xml.
- new LocalUserServiceTestConfig())
- .setEnvIsLoggedIn(true)
- .setEnvEmail("test@example.com")
- .setEnvAuthDomain("gmail.com");
-
- private FakeClock clock;
- private Guestbook guestbookUnderTest;
-
- @Before
- public void setUp() throws Exception {
- helper.setUp();
- clock = new FakeClock();
- guestbookUnderTest = new Guestbook(clock);
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void appendGreeting_normalData_setsContentProperty() {
- Greeting got = guestbookUnderTest.appendGreeting("Hello, Datastore!");
-
- assertThat(got.getContent())
- .named("content property")
- .isEqualTo("Hello, Datastore!");
- }
-
- @Test
- public void listGreetings_eventualConsistency_returnsPartialGreetings() {
- // Arrange
- guestbookUnderTest.appendGreeting("Hello, Datastore!");
- guestbookUnderTest.appendGreeting("Hello, Eventual Consistency!");
- guestbookUnderTest.appendGreeting("Hello, World!");
- guestbookUnderTest.appendGreeting("Güten Tag!");
-
- // Act
- List got = guestbookUnderTest.listGreetings();
-
- // The first time we query we should half of the results due to the fact that we simulate
- // eventual consistency by applying every other write.
- assertThat(got).hasSize(2);
- }
-
- @Test
- public void listGreetings_groomedDatastore_returnsAllGreetings() {
- // Arrange
- guestbookUnderTest.appendGreeting("Hello, Datastore!");
- guestbookUnderTest.appendGreeting("Hello, Eventual Consistency!");
- guestbookUnderTest.appendGreeting("Hello, World!");
-
- // Act
- guestbookUnderTest.listGreetings();
- // Second global query sees both Entities because we "groom" (attempt to
- // apply unapplied jobs) after every query.
- List got = guestbookUnderTest.listGreetings();
-
- assertThat(got).hasSize(3);
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java b/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java
deleted file mode 100644
index a12912c43d0..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-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;
-
-/**
- * Unit tests to demonstrate App Engine Datastore queries.
- */
-@RunWith(JUnit4.class)
-public class IndexesTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void propertyFilterExample_returnsMatchingEntities() throws Exception {
- // [START unindexed_properties_1]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Key acmeKey = KeyFactory.createKey("Company", "Acme");
-
- Entity tom = new Entity("Person", "Tom", acmeKey);
- tom.setProperty("name", "Tom");
- tom.setProperty("age", 32);
- datastore.put(tom);
-
- Entity lucy = new Entity("Person", "Lucy", acmeKey);
- lucy.setProperty("name", "Lucy");
- lucy.setUnindexedProperty("age", 29);
- datastore.put(lucy);
-
- Filter ageFilter = new FilterPredicate("age", FilterOperator.GREATER_THAN, 25);
-
- Query q = new Query("Person").setAncestor(acmeKey).setFilter(ageFilter);
-
- // Returns tom but not lucy, because her age is unindexed
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
- // [END unindexed_properties_1]
-
- assertThat(results).named("query results").containsExactly(tom);
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
deleted file mode 100644
index b1f33bbf3f9..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.SortDirection;
-import com.google.appengine.api.datastore.QueryResultList;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.common.collect.ImmutableList;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link ListPeopleServlet}.
- */
-@RunWith(JUnit4.class)
-public class ListPeopleServletTest {
- private static final ImmutableList TEST_NAMES =
- // Keep in alphabetical order, so this is the same as the query order.
- ImmutableList.builder()
- .add("Alpha")
- .add("Bravo")
- .add("Charlie")
- .add("Delta")
- .add("Echo")
- .add("Foxtrot")
- .add("Golf")
- .add("Hotel")
- .add("India")
- .add("Juliett")
- .add("Kilo")
- .add("Lima")
- .add("Mike")
- .add("November")
- .add("Oscar")
- .add("Papa")
- .add("Quebec")
- .add("Romeo")
- .add("Sierra")
- .add("Tango")
- .build();
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- private ListPeopleServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
-
- // Add test data.
- ImmutableList.Builder people = ImmutableList.builder();
- for (String name : TEST_NAMES) {
- people.add(createPerson(name));
- }
- datastore.put(people.build());
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new ListPeopleServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- private Entity createPerson(String name) {
- Entity person = new Entity("Person");
- person.setProperty("name", name);
- return person;
- }
-
- @Test
- public void doGet_noCursor_writesNames() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- String response = responseWriter.toString();
- for (int i = 0; i < ListPeopleServlet.PAGE_SIZE; i++) {
- assertThat(response).named("ListPeopleServlet response").contains(TEST_NAMES.get(i));
- }
- }
-
- private String getFirstCursor() {
- Query q = new Query("Person").addSort("name", SortDirection.ASCENDING);
- PreparedQuery pq = datastore.prepare(q);
- FetchOptions fetchOptions = FetchOptions.Builder.withLimit(ListPeopleServlet.PAGE_SIZE);
- QueryResultList results = pq.asQueryResultList(fetchOptions);
- return results.getCursor().toWebSafeString();
- }
-
- @Test
- public void doGet_withValidCursor_writesNames() throws Exception {
- when(mockRequest.getParameter("cursor")).thenReturn(getFirstCursor());
-
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- String response = responseWriter.toString();
- int i = 0;
- while (i + ListPeopleServlet.PAGE_SIZE < TEST_NAMES.size() && i < ListPeopleServlet.PAGE_SIZE) {
- assertThat(response)
- .named("ListPeopleServlet response")
- .contains(TEST_NAMES.get(i + ListPeopleServlet.PAGE_SIZE));
- i++;
- }
- }
-
- @Test
- public void doGet_withInvalidCursor_writesRedirect() throws Exception {
- when(mockRequest.getParameter("cursor")).thenReturn("ThisCursorIsTotallyInvalid");
- servletUnderTest.doGet(mockRequest, mockResponse);
- verify(mockResponse).sendRedirect("/people");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
deleted file mode 100644
index a39f4af36ca..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entities;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Transaction;
-import com.google.appengine.api.memcache.MemcacheService;
-import com.google.appengine.api.memcache.MemcacheServiceFactory;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalMemcacheServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
-
-/**
- * Unit tests to demonstrate App Engine Datastore entity group metadata.
- */
-@RunWith(JUnit4.class)
-public class MetadataEntityGroupTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig().setDefaultHighRepJobPolicyUnappliedJobPercentage(0),
- new LocalMemcacheServiceTestConfig());
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- // [START entity_group_1]
- private static long getEntityGroupVersion(DatastoreService ds, Transaction tx, Key entityKey) {
- try {
- return Entities.getVersionProperty(ds.get(tx, Entities.createEntityGroupKey(entityKey)));
- } catch (EntityNotFoundException e) {
- // No entity group information, return a value strictly smaller than any
- // possible version
- return 0;
- }
- }
-
- private static void printEntityGroupVersions(DatastoreService ds, PrintWriter writer) {
- Entity entity1 = new Entity("Simple");
- Key key1 = ds.put(entity1);
- Key entityGroupKey = Entities.createEntityGroupKey(key1);
-
- // Print entity1's entity group version
- writer.println("version " + getEntityGroupVersion(ds, null, key1));
-
- // Write to a different entity group
- Entity entity2 = new Entity("Simple");
- ds.put(entity2);
-
- // Will print the same version, as entity1's entity group has not changed
- writer.println("version " + getEntityGroupVersion(ds, null, key1));
-
- // Change entity1's entity group by adding a new child entity
- Entity entity3 = new Entity("Simple", entity1.getKey());
- ds.put(entity3);
-
- // Will print a higher version, as entity1's entity group has changed
- writer.println("version " + getEntityGroupVersion(ds, null, key1));
- }
- // [END entity_group_1]
-
- @Test
- public void printEntityGroupVersions_printsVersions() throws Exception {
- StringWriter responseWriter = new StringWriter();
- printEntityGroupVersions(datastore, new PrintWriter(responseWriter));
- assertThat(responseWriter.toString()).contains("version");
- }
-
- // [START entity_group_2]
- // A simple class for tracking consistent entity group counts.
- private static class EntityGroupCount implements Serializable {
- long version; // Version of the entity group whose count we are tracking
- int count;
-
- EntityGroupCount(long version, int count) {
- this.version = version;
- this.count = count;
- }
-
- // Display count of entities in an entity group, with consistent caching
- void showEntityGroupCount(
- DatastoreService ds, MemcacheService cache, PrintWriter writer, Key entityGroupKey) {
- EntityGroupCount egCount = (EntityGroupCount) cache.get(entityGroupKey);
- // Reuses getEntityGroupVersion method from the previous example.
- if (egCount != null && egCount.version == getEntityGroupVersion(ds, null, entityGroupKey)) {
- // Cached value matched current entity group version, use that
- writer.println(egCount.count + " entities (cached)");
- } else {
- // Need to actually count entities. Using a transaction to get a consistent count
- // and entity group version.
- Transaction tx = ds.beginTransaction();
- PreparedQuery pq = ds.prepare(tx, new Query(entityGroupKey));
- int count = pq.countEntities(FetchOptions.Builder.withLimit(5000));
- cache.put(
- entityGroupKey,
- new EntityGroupCount(getEntityGroupVersion(ds, tx, entityGroupKey), count));
- tx.rollback();
- writer.println(count + " entities");
- }
- }
- }
- // [END entity_group_2]
-
- @Test
- public void entityGroupCount_printsCount() throws Exception {
- StringWriter responseWriter = new StringWriter();
- MemcacheService cache = MemcacheServiceFactory.getMemcacheService();
- Entity entity1 = new Entity("Simple");
- Key key1 = datastore.put(entity1);
- Key entityGroupKey = Entities.createEntityGroupKey(key1);
-
- EntityGroupCount groupCount = new EntityGroupCount(0, 0);
- groupCount.showEntityGroupCount(
- datastore, cache, new PrintWriter(responseWriter), entityGroupKey);
-
- assertThat(responseWriter.toString()).contains(" entities");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java
deleted file mode 100644
index 998d2ab33cf..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entities;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Unit tests to demonstrate App Engine Datastore kinds metadata.
- */
-@RunWith(JUnit4.class)
-public class MetadataKindsTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- responseWriter = new StringWriter();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- // [START kind_query_example]
- void printLowercaseKinds(DatastoreService ds, PrintWriter writer) {
-
- // Start with unrestricted kind query
- Query q = new Query(Entities.KIND_METADATA_KIND);
-
- List subFils = new ArrayList();
-
- // Limit to lowercase initial letters
- subFils.add(
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- FilterOperator.GREATER_THAN_OR_EQUAL,
- Entities.createKindKey("a")));
-
- String endChar = Character.toString((char) ('z' + 1)); // Character after 'z'
-
- subFils.add(
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- FilterOperator.LESS_THAN,
- Entities.createKindKey(endChar)));
-
- q.setFilter(CompositeFilterOperator.and(subFils));
-
- // Print heading
- writer.println("Lowercase kinds:");
-
- // Print query results
- for (Entity e : ds.prepare(q).asIterable()) {
- writer.println(" " + e.getKey().getName());
- }
- }
- // [END kind_query_example]
-
- @Test
- public void printLowercaseKinds_printsKinds() throws Exception {
- datastore.put(new Entity("alpha"));
- datastore.put(new Entity("beta"));
- datastore.put(new Entity("NotIncluded"));
- datastore.put(new Entity("zed"));
-
- printLowercaseKinds(datastore, new PrintWriter(responseWriter));
-
- String response = responseWriter.toString();
- assertThat(response).contains("alpha");
- assertThat(response).contains("beta");
- assertThat(response).contains("zed");
- assertThat(response).doesNotContain("NotIncluded");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java
deleted file mode 100644
index e31f7a14852..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.NamespaceManager;
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entities;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Unit tests to demonstrate App Engine Datastore namespaces metadata.
- */
-@RunWith(JUnit4.class)
-public class MetadataNamespacesTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- responseWriter = new StringWriter();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- // [START queries_intro_example]
- void printAllNamespaces(DatastoreService ds, PrintWriter writer) {
- Query q = new Query(Entities.NAMESPACE_METADATA_KIND);
-
- for (Entity e : ds.prepare(q).asIterable()) {
- // A nonzero numeric id denotes the default namespace;
- // see Namespace Queries, below
- if (e.getKey().getId() != 0) {
- writer.println("");
- } else {
- writer.println(e.getKey().getName());
- }
- }
- }
- // [END queries_intro_example]
-
- @Test
- public void printAllNamespaces_printsNamespaces() throws Exception {
- datastore.put(new Entity("Simple"));
- NamespaceManager.set("another-namespace");
- datastore.put(new Entity("Simple"));
-
- printAllNamespaces(datastore, new PrintWriter(responseWriter));
-
- String response = responseWriter.toString();
- assertThat(response).contains("");
- assertThat(response).contains("another-namespace");
- }
-
- // [START namespace_query_example]
- List getNamespaces(DatastoreService ds, String start, String end) {
-
- // Start with unrestricted namespace query
- Query q = new Query(Entities.NAMESPACE_METADATA_KIND);
- List subFilters = new ArrayList();
- // Limit to specified range, if any
- if (start != null) {
- subFilters.add(
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- FilterOperator.GREATER_THAN_OR_EQUAL,
- Entities.createNamespaceKey(start)));
- }
- if (end != null) {
- subFilters.add(
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- FilterOperator.LESS_THAN_OR_EQUAL,
- Entities.createNamespaceKey(end)));
- }
-
- q.setFilter(CompositeFilterOperator.and(subFilters));
-
- // Initialize result list
- List results = new ArrayList();
-
- // Build list of query results
- for (Entity e : ds.prepare(q).asIterable()) {
- results.add(Entities.getNamespaceFromNamespaceKey(e.getKey()));
- }
-
- // Return result list
- return results;
- }
- // [END namespace_query_example]
-
- @Test
- public void getNamespaces_returnsNamespaces() throws Exception {
- NamespaceManager.set("alpha");
- datastore.put(new Entity("Simple"));
- NamespaceManager.set("bravo");
- datastore.put(new Entity("Simple"));
- NamespaceManager.set("charlie");
- datastore.put(new Entity("Simple"));
- NamespaceManager.set("zed");
- datastore.put(new Entity("Simple"));
-
- List results = getNamespaces(datastore, "bravo", "echo");
-
- assertThat(results).containsExactly("bravo", "charlie");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java
deleted file mode 100644
index 88ba79008ab..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entities;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.api.datastore.Query.SortDirection;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Unit tests to demonstrate App Engine Datastore properties metadata.
- */
-@RunWith(JUnit4.class)
-public class MetadataPropertiesTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- responseWriter = new StringWriter();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- // [START property_query_example]
- void printProperties(DatastoreService ds, PrintWriter writer) {
-
- // Create unrestricted keys-only property query
- Query q = new Query(Entities.PROPERTY_METADATA_KIND).setKeysOnly();
-
- // Print query results
- for (Entity e : ds.prepare(q).asIterable()) {
- writer.println(e.getKey().getParent().getName() + ": " + e.getKey().getName());
- }
- }
- // [END property_query_example]
-
- @Test
- public void printProperties_printsProperties() throws Exception {
- Entity a = new Entity("Widget");
- a.setProperty("combobulators", 2);
- a.setProperty("oscillatorState", "harmonzing");
- Entity b = new Entity("Ship");
- b.setProperty("sails", 2);
- b.setProperty("captain", "Blackbeard");
- Entity c = new Entity("Ship");
- c.setProperty("captain", "Redbeard");
- c.setProperty("motor", "outboard");
- datastore.put(Arrays.asList(a, b, c));
-
- printProperties(datastore, new PrintWriter(responseWriter));
-
- String response = responseWriter.toString();
- assertThat(response).contains("Widget: combobulators");
- assertThat(response).contains("Widget: oscillatorState");
- assertThat(response).contains("Ship: sails");
- assertThat(response).contains("Ship: captain");
- assertThat(response).contains("Ship: motor");
- }
-
- // [START property_filtering_example]
- void printPropertyRange(DatastoreService ds, PrintWriter writer) {
-
- // Start with unrestricted keys-only property query
- Query q = new Query(Entities.PROPERTY_METADATA_KIND).setKeysOnly();
-
- // Limit range
- q.setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- Query.FilterOperator.GREATER_THAN_OR_EQUAL,
- Entities.createPropertyKey("Employee", "salary")),
- new FilterPredicate(
- Entity.KEY_RESERVED_PROPERTY,
- Query.FilterOperator.LESS_THAN_OR_EQUAL,
- Entities.createPropertyKey("Manager", "salary"))));
- q.addSort(Entity.KEY_RESERVED_PROPERTY, SortDirection.ASCENDING);
-
- // Print query results
- for (Entity e : ds.prepare(q).asIterable()) {
- writer.println(e.getKey().getParent().getName() + ": " + e.getKey().getName());
- }
- }
- // [END property_filtering_example]
-
- @Test
- public void printPropertyRange_printsProperties() throws Exception {
- Entity account = new Entity("Account");
- account.setProperty("balance", "10.30");
- account.setProperty("company", "General Company");
- Entity employee = new Entity("Employee");
- employee.setProperty("name", "John Doe");
- employee.setProperty("ssn", "987-65-4321");
- Entity invoice = new Entity("Invoice");
- invoice.setProperty("date", new Date());
- invoice.setProperty("amount", "99.98");
- Entity manager = new Entity("Manager");
- manager.setProperty("name", "Jane Doe");
- manager.setProperty("title", "Technical Director");
- Entity product = new Entity("Product");
- product.setProperty("description", "Widget to re-ionize an oscillator");
- product.setProperty("price", "19.97");
- datastore.put(Arrays.asList(account, employee, invoice, manager, product));
-
- printPropertyRange(datastore, new PrintWriter(responseWriter));
-
- String response = responseWriter.toString();
- assertThat(response)
- .isEqualTo("Employee: ssn\nInvoice: amount\nInvoice: date\nManager: name\n");
- }
-
- // [START property_ancestor_query_example]
- List propertiesOfKind(DatastoreService ds, String kind) {
-
- // Start with unrestricted keys-only property query
- Query q = new Query(Entities.PROPERTY_METADATA_KIND).setKeysOnly();
-
- // Limit to specified kind
- q.setAncestor(Entities.createKindKey(kind));
-
- // Initialize result list
- ArrayList results = new ArrayList();
-
- //Build list of query results
- for (Entity e : ds.prepare(q).asIterable()) {
- results.add(e.getKey().getName());
- }
-
- // Return result list
- return results;
- }
- // [END property_ancestor_query_example]
-
- @Test
- public void propertiesOfKind_returnsProperties() throws Exception {
- Entity a = new Entity("Alpha");
- a.setProperty("beta", 12);
- a.setProperty("charlie", "misc.");
- Entity b = new Entity("Alpha");
- b.setProperty("charlie", "assorted");
- b.setProperty("delta", new Date());
- Entity c = new Entity("Charlie");
- c.setProperty("charlie", "some");
- c.setProperty("echo", new Date());
- datastore.put(Arrays.asList(a, b, c));
-
- List properties = propertiesOfKind(datastore, "Alpha");
-
- assertThat(properties).containsExactly("beta", "charlie", "delta");
- }
-
- // [START property_representation_query_example]
- Collection representationsOfProperty(DatastoreService ds, String kind, String property) {
-
- // Start with unrestricted non-keys-only property query
- Query q = new Query(Entities.PROPERTY_METADATA_KIND);
-
- // Limit to specified kind and property
- q.setFilter(
- new FilterPredicate(
- "__key__", Query.FilterOperator.EQUAL, Entities.createPropertyKey(kind, property)));
-
- // Get query result
- Entity propInfo = ds.prepare(q).asSingleEntity();
-
- // Return collection of property representations
- return (Collection) propInfo.getProperty("property_representation");
- }
- // [END property_representation_query_example]
-
- @Test
- public void representationsOfProperty_returnsRepresentations() throws Exception {
- Entity a = new Entity("Alpha");
- a.setProperty("beta", 12);
- Entity b = new Entity("Alpha");
- b.setProperty("beta", true);
- Entity c = new Entity("Alpha");
- c.setProperty("beta", new Date());
- datastore.put(Arrays.asList(a, b, c));
-
- Collection results = representationsOfProperty(datastore, "Alpha", "beta");
-
- assertThat(results).containsExactly("INT64", "BOOLEAN");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java
deleted file mode 100644
index 7e71cfee7a5..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.example.time.testing.FakeClock;
-
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link ProjectionServlet}.
- */
-@RunWith(JUnit4.class)
-public class ProjectionServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private ProjectionServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new ProjectionServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesNoGreetings() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- assertThat(responseWriter.toString())
- .named("ProjectionServlet response")
- .doesNotContain("Message");
- }
-
- @Test
- public void doGet_manyGreetings_writesLatestGreetings() throws Exception {
- // Arrange
- GuestbookStrong guestbook =
- new GuestbookStrong(GuestbookStrongServlet.GUESTBOOK_ID, new FakeClock());
- guestbook.appendGreeting("Hello.");
- guestbook.appendGreeting("Güten Tag!");
- guestbook.appendGreeting("Hi.");
- guestbook.appendGreeting("Hola.");
-
- // Act
- servletUnderTest.doGet(mockRequest, mockResponse);
- String output = responseWriter.toString();
-
- assertThat(output)
- .named("ProjectionServlet response")
- .contains("Message Hello.");
- assertThat(output)
- .named("ProjectionServlet response")
- .contains("Message Güten Tag!");
- assertThat(output)
- .named("ProjectionServlet response")
- .contains("Message Hola.");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java b/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java
deleted file mode 100644
index 494f1577ce4..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.PropertyProjection;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-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;
-
-/**
- * Unit tests to demonstrate App Engine Datastore projection queries.
- */
-@RunWith(JUnit4.class)
-public class ProjectionTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() throws Exception {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
-
- @Test
- public void projectionQuery_grouping_filtersDuplicates() {
- putTestData("some duplicate", 0L);
- putTestData("some duplicate", 0L);
- putTestData("too big", 1L);
-
- // [START grouping]
- Query q = new Query("TestKind");
- q.addProjection(new PropertyProjection("A", String.class));
- q.addProjection(new PropertyProjection("B", Long.class));
- q.setDistinct(true);
- q.setFilter(Query.FilterOperator.LESS_THAN.of("B", 1L));
- q.addSort("B", Query.SortDirection.DESCENDING);
- q.addSort("A");
- // [END grouping]
-
- List entities =
- datastore.prepare(q).asList(FetchOptions.Builder.withLimit(5));
- assertThat(entities).hasSize(1);
- Entity entity = entities.get(0);
- assertThat((String) entity.getProperty("A")).named("entity.A").isEqualTo("some duplicate");
- assertThat((long) entity.getProperty("B")).named("entity.B").isEqualTo(0L);
- }
-
- private void putTestData(String a, long b) {
- Entity entity = new Entity("TestKind");
- entity.setProperty("A", a);
- entity.setProperty("B", b);
- datastore.put(entity);
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java b/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java
deleted file mode 100644
index 07c3dd13c60..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.PreparedQuery.TooManyResultsException;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.CompositeFilter;
-import com.google.appengine.api.datastore.Query.CompositeFilterOperator;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.api.datastore.Query.SortDirection;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.common.collect.ImmutableList;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Unit tests to demonstrate App Engine Datastore queries.
- */
-@RunWith(JUnit4.class)
-public class QueriesTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void propertyFilterExample_returnsMatchingEntities() throws Exception {
- // Arrange
- Entity p1 = new Entity("Person");
- p1.setProperty("height", 120);
- Entity p2 = new Entity("Person");
- p2.setProperty("height", 180);
- Entity p3 = new Entity("Person");
- p3.setProperty("height", 160);
- datastore.put(ImmutableList.of(p1, p2, p3));
-
- // Act
- long minHeight = 160;
- // [START property_filter_example]
- Filter propertyFilter =
- new FilterPredicate("height", FilterOperator.GREATER_THAN_OR_EQUAL, minHeight);
- Query q = new Query("Person").setFilter(propertyFilter);
- // [END property_filter_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(p2, p3);
- }
-
- @Test
- public void keyFilterExample_returnsMatchingEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- Entity b = new Entity("Person", "b");
- Entity c = new Entity("Person", "c");
- Entity aa = new Entity("Person", "aa", b.getKey());
- Entity bb = new Entity("Person", "bb", b.getKey());
- Entity aaa = new Entity("Person", "aaa", bb.getKey());
- Entity bbb = new Entity("Person", "bbb", bb.getKey());
- datastore.put(ImmutableList.of(a, b, c, aa, bb, aaa, bbb));
-
- // Act
- Key lastSeenKey = bb.getKey();
- // [START key_filter_example]
- Filter keyFilter =
- new FilterPredicate(Entity.KEY_RESERVED_PROPERTY, FilterOperator.GREATER_THAN, lastSeenKey);
- Query q = new Query("Person").setFilter(keyFilter);
- // [END key_filter_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results)
- .named("query results")
- .containsExactly(
- aaa, // Ancestor path "b/bb/aaa" is greater than "b/bb".
- bbb, // Ancestor path "b/bb/bbb" is greater than "b/bb".
- c); // Key name identifier "c" is greater than b.
- }
-
- @Test
- public void keyFilterExample_kindless_returnsMatchingEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Child", "a");
- Entity b = new Entity("Child", "b");
- Entity c = new Entity("Child", "c");
- Entity aa = new Entity("Child", "aa", b.getKey());
- Entity bb = new Entity("Child", "bb", b.getKey());
- Entity aaa = new Entity("Child", "aaa", bb.getKey());
- Entity bbb = new Entity("Child", "bbb", bb.getKey());
- Entity adult = new Entity("Adult", "a");
- Entity zooAnimal = new Entity("ZooAnimal", "a");
- datastore.put(ImmutableList.of(a, b, c, aa, bb, aaa, bbb, adult, zooAnimal));
-
- // Act
- Key lastSeenKey = bb.getKey();
- // [START kindless_query_example]
- Filter keyFilter =
- new FilterPredicate(Entity.KEY_RESERVED_PROPERTY, FilterOperator.GREATER_THAN, lastSeenKey);
- Query q = new Query().setFilter(keyFilter);
- // [END kindless_query_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results)
- .named("query results")
- .containsExactly(
- aaa, // Ancestor path "b/bb/aaa" is greater than "b/bb".
- bbb, // Ancestor path "b/bb/bbb" is greater than "b/bb".
- zooAnimal, // Kind "ZooAnimal" is greater than "Child"
- c); // Key name identifier "c" is greater than b.
- }
-
- @Test
- public void ancestorFilterExample_returnsMatchingEntities() throws Exception {
- Entity a = new Entity("Person", "a");
- Entity b = new Entity("Person", "b");
- Entity aa = new Entity("Person", "aa", a.getKey());
- Entity ab = new Entity("Person", "ab", a.getKey());
- Entity bb = new Entity("Person", "bb", b.getKey());
- datastore.put(ImmutableList.of(a, b, aa, ab, bb));
-
- Key ancestorKey = a.getKey();
- // [START ancestor_filter_example]
- Query q = new Query("Person").setAncestor(ancestorKey);
- // [END ancestor_filter_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, aa, ab);
- }
-
- @Test
- public void ancestorQueryExample_returnsMatchingEntities() throws Exception {
- // [START ancestor_query_example]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Entity tom = new Entity("Person", "Tom");
- Key tomKey = tom.getKey();
- datastore.put(tom);
-
- Entity weddingPhoto = new Entity("Photo", tomKey);
- weddingPhoto.setProperty("imageURL", "http://domain.com/some/path/to/wedding_photo.jpg");
-
- Entity babyPhoto = new Entity("Photo", tomKey);
- babyPhoto.setProperty("imageURL", "http://domain.com/some/path/to/baby_photo.jpg");
-
- Entity dancePhoto = new Entity("Photo", tomKey);
- dancePhoto.setProperty("imageURL", "http://domain.com/some/path/to/dance_photo.jpg");
-
- Entity campingPhoto = new Entity("Photo");
- campingPhoto.setProperty("imageURL", "http://domain.com/some/path/to/camping_photo.jpg");
-
- List photoList = Arrays.asList(weddingPhoto, babyPhoto, dancePhoto, campingPhoto);
- datastore.put(photoList);
-
- Query photoQuery = new Query("Photo").setAncestor(tomKey);
-
- // This returns weddingPhoto, babyPhoto, and dancePhoto,
- // but not campingPhoto, because tom is not an ancestor
- List results =
- datastore.prepare(photoQuery).asList(FetchOptions.Builder.withDefaults());
- // [END ancestor_query_example]
-
- assertThat(results).named("query results").containsExactly(weddingPhoto, babyPhoto, dancePhoto);
- }
-
- @Test
- public void ancestorQueryExample_kindlessKeyFilter_returnsMatchingEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Grandparent", "a");
- Entity b = new Entity("Grandparent", "b");
- Entity c = new Entity("Grandparent", "c");
- Entity aa = new Entity("Parent", "aa", a.getKey());
- Entity ba = new Entity("Parent", "ba", b.getKey());
- Entity bb = new Entity("Parent", "bb", b.getKey());
- Entity bc = new Entity("Parent", "bc", b.getKey());
- Entity cc = new Entity("Parent", "cc", c.getKey());
- Entity aaa = new Entity("Child", "aaa", aa.getKey());
- Entity bbb = new Entity("Child", "bbb", bb.getKey());
- datastore.put(ImmutableList.of(a, b, c, aa, ba, bb, bc, cc, aaa, bbb));
-
- // Act
- Key ancestorKey = b.getKey();
- Key lastSeenKey = bb.getKey();
- // [START kindless_ancestor_key_query_example]
- Filter keyFilter =
- new FilterPredicate(Entity.KEY_RESERVED_PROPERTY, FilterOperator.GREATER_THAN, lastSeenKey);
- Query q = new Query().setAncestor(ancestorKey).setFilter(keyFilter);
- // [END kindless_ancestor_key_query_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(bc, bbb);
- }
-
- @Test
- public void ancestorQueryExample_kindlessKeyFilterFull_returnsMatchingEntities()
- throws Exception {
- // [START kindless_ancestor_query_example]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Entity tom = new Entity("Person", "Tom");
- Key tomKey = tom.getKey();
- datastore.put(tom);
-
- Entity weddingPhoto = new Entity("Photo", tomKey);
- weddingPhoto.setProperty("imageURL", "http://domain.com/some/path/to/wedding_photo.jpg");
-
- Entity weddingVideo = new Entity("Video", tomKey);
- weddingVideo.setProperty("videoURL", "http://domain.com/some/path/to/wedding_video.avi");
-
- List mediaList = Arrays.asList(weddingPhoto, weddingVideo);
- datastore.put(mediaList);
-
- // By default, ancestor queries include the specified ancestor itself.
- // The following filter excludes the ancestor from the query results.
- Filter keyFilter =
- new FilterPredicate(Entity.KEY_RESERVED_PROPERTY, FilterOperator.GREATER_THAN, tomKey);
-
- Query mediaQuery = new Query().setAncestor(tomKey).setFilter(keyFilter);
-
- // Returns both weddingPhoto and weddingVideo,
- // even though they are of different entity kinds
- List results =
- datastore.prepare(mediaQuery).asList(FetchOptions.Builder.withDefaults());
- // [END kindless_ancestor_query_example]
-
- assertThat(results).named("query result keys").containsExactly(weddingPhoto, weddingVideo);
- }
-
- @Test
- public void keysOnlyExample_returnsMatchingEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- Entity b = new Entity("Building", "b");
- Entity c = new Entity("Person", "c");
- datastore.put(ImmutableList.of(a, b, c));
-
- // [START keys_only_example]
- Query q = new Query("Person").setKeysOnly();
- // [END keys_only_example]
-
- // Assert
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, c);
- }
-
- @Test
- public void sortOrderExample_returnsSortedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("lastName", "Alpha");
- a.setProperty("height", 100);
- Entity b = new Entity("Person", "b");
- b.setProperty("lastName", "Bravo");
- b.setProperty("height", 200);
- Entity c = new Entity("Person", "c");
- c.setProperty("lastName", "Charlie");
- c.setProperty("height", 300);
- datastore.put(ImmutableList.of(a, b, c));
-
- // Act
- // [START sort_order_example]
- // Order alphabetically by last name:
- Query q1 = new Query("Person").addSort("lastName", SortDirection.ASCENDING);
-
- // Order by height, tallest to shortest:
- Query q2 = new Query("Person").addSort("height", SortDirection.DESCENDING);
- // [END sort_order_example]
-
- // Assert
- List lastNameResults =
- datastore.prepare(q1.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(lastNameResults).named("last name query results").containsExactly(a, b, c).inOrder();
- List heightResults =
- datastore.prepare(q2.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(heightResults).named("height query results").containsExactly(c, b, a).inOrder();
- }
-
- @Test
- public void sortOrderExample_multipleSortOrders_returnsSortedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("lastName", "Alpha");
- a.setProperty("height", 100);
- Entity b1 = new Entity("Person", "b1");
- b1.setProperty("lastName", "Bravo");
- b1.setProperty("height", 150);
- Entity b2 = new Entity("Person", "b2");
- b2.setProperty("lastName", "Bravo");
- b2.setProperty("height", 200);
- Entity c = new Entity("Person", "c");
- c.setProperty("lastName", "Charlie");
- c.setProperty("height", 300);
- datastore.put(ImmutableList.of(a, b1, b2, c));
-
- // Act
- // [START multiple_sort_orders_example]
- Query q =
- new Query("Person")
- .addSort("lastName", SortDirection.ASCENDING)
- .addSort("height", SortDirection.DESCENDING);
- // [END multiple_sort_orders_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, b2, b1, c).inOrder();
- }
-
- @Test
- public void queryInterface_multipleFilters_printsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("firstName", "Alph");
- a.setProperty("lastName", "Alpha");
- a.setProperty("height", 60);
- Entity b = new Entity("Person", "b");
- b.setProperty("firstName", "Bee");
- b.setProperty("lastName", "Bravo");
- b.setProperty("height", 70);
- Entity c = new Entity("Person", "c");
- c.setProperty("firstName", "Charles");
- c.setProperty("lastName", "Charlie");
- c.setProperty("height", 100);
- datastore.put(ImmutableList.of(a, b, c));
-
- StringWriter buf = new StringWriter();
- PrintWriter out = new PrintWriter(buf);
- long minHeight = 60;
- long maxHeight = 72;
-
- // Act
- // [START interface_1]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Filter heightMinFilter =
- new FilterPredicate("height", FilterOperator.GREATER_THAN_OR_EQUAL, minHeight);
-
- Filter heightMaxFilter =
- new FilterPredicate("height", FilterOperator.LESS_THAN_OR_EQUAL, maxHeight);
-
- // Use CompositeFilter to combine multiple filters
- CompositeFilter heightRangeFilter =
- CompositeFilterOperator.and(heightMinFilter, heightMaxFilter);
-
- // Use class Query to assemble a query
- Query q = new Query("Person").setFilter(heightRangeFilter);
-
- // Use PreparedQuery interface to retrieve results
- PreparedQuery pq = datastore.prepare(q);
-
- for (Entity result : pq.asIterable()) {
- String firstName = (String) result.getProperty("firstName");
- String lastName = (String) result.getProperty("lastName");
- Long height = (Long) result.getProperty("height");
-
- out.println(firstName + " " + lastName + ", " + height + " inches tall");
- }
- // [END interface_1]
-
- // Assert
- assertThat(buf.toString()).contains("Alph Alpha, 60 inches tall");
- assertThat(buf.toString()).contains("Bee Bravo, 70 inches tall");
- assertThat(buf.toString()).doesNotContain("Charlie");
- }
-
- @Test
- public void queryInterface_singleFilter_returnsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("height", 100);
- Entity b = new Entity("Person", "b");
- b.setProperty("height", 150);
- Entity c = new Entity("Person", "c");
- c.setProperty("height", 300);
- datastore.put(ImmutableList.of(a, b, c));
-
- // Act
- long minHeight = 150;
- // [START interface_2]
- Filter heightMinFilter =
- new FilterPredicate("height", FilterOperator.GREATER_THAN_OR_EQUAL, minHeight);
-
- Query q = new Query("Person").setFilter(heightMinFilter);
- // [END interface_2]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(b, c);
- }
-
- @Test
- public void queryInterface_orFilter_printsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("height", 100);
- Entity b = new Entity("Person", "b");
- b.setProperty("height", 150);
- Entity c = new Entity("Person", "c");
- c.setProperty("height", 200);
- datastore.put(ImmutableList.of(a, b, c));
-
- StringWriter buf = new StringWriter();
- PrintWriter out = new PrintWriter(buf);
- long minHeight = 125;
- long maxHeight = 175;
-
- // Act
- // [START interface_3]
- Filter tooShortFilter = new FilterPredicate("height", FilterOperator.LESS_THAN, minHeight);
-
- Filter tooTallFilter = new FilterPredicate("height", FilterOperator.GREATER_THAN, maxHeight);
-
- Filter heightOutOfRangeFilter = CompositeFilterOperator.or(tooShortFilter, tooTallFilter);
-
- Query q = new Query("Person").setFilter(heightOutOfRangeFilter);
- // [END interface_3]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, c);
- }
-
- @Test
- public void queryRestrictions_compositeFilter_returnsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("birthYear", 1930);
- Entity b = new Entity("Person", "b");
- b.setProperty("birthYear", 1960);
- Entity c = new Entity("Person", "c");
- c.setProperty("birthYear", 1990);
- datastore.put(ImmutableList.of(a, b, c));
-
- // Act
- long minBirthYear = 1940;
- long maxBirthYear = 1980;
- // [START inequality_filters_one_property_valid_example_1]
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- Filter birthYearMaxFilter =
- new FilterPredicate("birthYear", FilterOperator.LESS_THAN_OR_EQUAL, maxBirthYear);
-
- Filter birthYearRangeFilter =
- CompositeFilterOperator.and(birthYearMinFilter, birthYearMaxFilter);
-
- Query q = new Query("Person").setFilter(birthYearRangeFilter);
- // [END inequality_filters_one_property_valid_example_1]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(b);
- }
-
- @Test
- public void queryRestrictions_compositeFilter_isInvalid() throws Exception {
- long minBirthYear = 1940;
- long maxHeight = 200;
- // [START inequality_filters_one_property_invalid_example]
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- Filter heightMaxFilter =
- new FilterPredicate("height", FilterOperator.LESS_THAN_OR_EQUAL, maxHeight);
-
- Filter invalidFilter = CompositeFilterOperator.and(birthYearMinFilter, heightMaxFilter);
-
- Query q = new Query("Person").setFilter(invalidFilter);
- // [END inequality_filters_one_property_invalid_example]
-
- // Note: The local devserver behavior is different than the production
- // version of Cloud Datastore, so there aren't any assertions we can make
- // in this test. The query appears to work with the local test runner,
- // but will fail in production.
- }
-
- @Test
- public void queryRestrictions_compositeEqualFilter_returnsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("birthYear", 1930);
- a.setProperty("city", "Somewhere");
- a.setProperty("lastName", "Someone");
- Entity b = new Entity("Person", "b");
- b.setProperty("birthYear", 1960);
- b.setProperty("city", "Somewhere");
- b.setProperty("lastName", "Someone");
- Entity c = new Entity("Person", "c");
- c.setProperty("birthYear", 1990);
- c.setProperty("city", "Somewhere");
- c.setProperty("lastName", "Someone");
- Entity d = new Entity("Person", "d");
- d.setProperty("birthYear", 1960);
- d.setProperty("city", "Nowhere");
- d.setProperty("lastName", "Someone");
- Entity e = new Entity("Person", "e");
- e.setProperty("birthYear", 1960);
- e.setProperty("city", "Somewhere");
- e.setProperty("lastName", "Noone");
- datastore.put(ImmutableList.of(a, b, c, d, e));
- long minBirthYear = 1940;
- long maxBirthYear = 1980;
- String targetCity = "Somewhere";
- String targetLastName = "Someone";
-
- // [START inequality_filters_one_property_valid_example_2]
- Filter lastNameFilter = new FilterPredicate("lastName", FilterOperator.EQUAL, targetLastName);
-
- Filter cityFilter = new FilterPredicate("city", FilterOperator.EQUAL, targetCity);
-
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- Filter birthYearMaxFilter =
- new FilterPredicate("birthYear", FilterOperator.LESS_THAN_OR_EQUAL, maxBirthYear);
-
- Filter validFilter =
- CompositeFilterOperator.and(
- lastNameFilter, cityFilter, birthYearMinFilter, birthYearMaxFilter);
-
- Query q = new Query("Person").setFilter(validFilter);
- // [END inequality_filters_one_property_valid_example_2]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(b);
- }
-
- @Test
- public void queryRestrictions_inequalitySortedFirst_returnsMatchedEntities() throws Exception {
- // Arrange
- Entity a = new Entity("Person", "a");
- a.setProperty("birthYear", 1930);
- a.setProperty("lastName", "Someone");
- Entity b = new Entity("Person", "b");
- b.setProperty("birthYear", 1990);
- b.setProperty("lastName", "Bravo");
- Entity c = new Entity("Person", "c");
- c.setProperty("birthYear", 1960);
- c.setProperty("lastName", "Charlie");
- Entity d = new Entity("Person", "d");
- d.setProperty("birthYear", 1960);
- d.setProperty("lastName", "Delta");
- datastore.put(ImmutableList.of(a, b, c, d));
- long minBirthYear = 1940;
-
- // [START inequality_filters_sort_orders_valid_example]
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- Query q =
- new Query("Person")
- .setFilter(birthYearMinFilter)
- .addSort("birthYear", SortDirection.ASCENDING)
- .addSort("lastName", SortDirection.ASCENDING);
- // [END inequality_filters_sort_orders_valid_example]
-
- // Assert
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(c, d, b).inOrder();
- }
-
- @Test
- public void queryRestrictions_missingSortOnInequality_isInvalid() throws Exception {
- long minBirthYear = 1940;
- // [START inequality_filters_sort_orders_invalid_example_1]
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- // Not valid. Missing sort on birthYear.
- Query q =
- new Query("Person")
- .setFilter(birthYearMinFilter)
- .addSort("lastName", SortDirection.ASCENDING);
- // [END inequality_filters_sort_orders_invalid_example_1]
-
- // Note: The local devserver behavior is different than the production
- // version of Cloud Datastore, so there aren't any assertions we can make
- // in this test. The query appears to work with the local test runner,
- // but will fail in production.
- }
-
- @Test
- public void queryRestrictions_sortWrongOrderOnInequality_isInvalid() throws Exception {
- long minBirthYear = 1940;
- // [START inequality_filters_sort_orders_invalid_example_2]
- Filter birthYearMinFilter =
- new FilterPredicate("birthYear", FilterOperator.GREATER_THAN_OR_EQUAL, minBirthYear);
-
- // Not valid. Sort on birthYear needs to be first.
- Query q =
- new Query("Person")
- .setFilter(birthYearMinFilter)
- .addSort("lastName", SortDirection.ASCENDING)
- .addSort("birthYear", SortDirection.ASCENDING);
- // [END inequality_filters_sort_orders_invalid_example_2]
-
- // Note: The local devserver behavior is different than the production
- // version of Cloud Datastore, so there aren't any assertions we can make
- // in this test. The query appears to work with the local test runner,
- // but will fail in production.
- }
-
- @Test
- public void queryRestrictions_surprisingMultipleValuesAllMustMatch_returnsNoEntities()
- throws Exception {
- Entity a = new Entity("Widget", "a");
- List xs = Arrays.asList(1L, 2L);
- a.setProperty("x", xs);
- datastore.put(a);
-
- // [START surprising_behavior_example_1]
- Query q =
- new Query("Widget")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("x", FilterOperator.GREATER_THAN, 1),
- new FilterPredicate("x", FilterOperator.LESS_THAN, 2)));
- // [END surprising_behavior_example_1]
-
- // Entity "a" will not match because no individual value matches all filters.
- // See the documentation for more details:
- // https://cloud.google.com/appengine/docs/java/datastore/query-restrictions#properties_with_multiple_values_can_behave_in_surprising_ways
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").isEmpty();
- }
-
- @Test
- public void queryRestrictions_surprisingMultipleValuesEquals_returnsMatchedEntities()
- throws Exception {
- Entity a = new Entity("Widget", "a");
- a.setProperty("x", ImmutableList.of(1L, 2L));
- Entity b = new Entity("Widget", "b");
- b.setProperty("x", ImmutableList.of(1L, 3L));
- Entity c = new Entity("Widget", "c");
- c.setProperty("x", ImmutableList.of(-6L, 2L));
- Entity d = new Entity("Widget", "d");
- d.setProperty("x", ImmutableList.of(-6L, 4L));
- Entity e = new Entity("Widget", "e");
- e.setProperty("x", ImmutableList.of(1L, 2L, 3L));
- datastore.put(ImmutableList.of(a, b, c, d, e));
-
- // [START surprising_behavior_example_2]
- Query q =
- new Query("Widget")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("x", FilterOperator.EQUAL, 1),
- new FilterPredicate("x", FilterOperator.EQUAL, 2)));
- // [END surprising_behavior_example_2]
-
- // Only "a" and "e" have both 1 and 2 in the "x" array-valued property.
- // See the documentation for more details:
- // https://cloud.google.com/appengine/docs/java/datastore/query-restrictions#properties_with_multiple_values_can_behave_in_surprising_ways
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, e);
- }
-
- @Test
- public void queryRestrictions_surprisingMultipleValuesNotEquals_returnsMatchedEntities()
- throws Exception {
- Entity a = new Entity("Widget", "a");
- a.setProperty("x", ImmutableList.of(1L, 2L));
- Entity b = new Entity("Widget", "b");
- b.setProperty("x", ImmutableList.of(1L, 3L));
- Entity c = new Entity("Widget", "c");
- c.setProperty("x", ImmutableList.of(-6L, 2L));
- Entity d = new Entity("Widget", "d");
- d.setProperty("x", ImmutableList.of(-6L, 4L));
- Entity e = new Entity("Widget", "e");
- e.setProperty("x", ImmutableList.of(1L));
- datastore.put(ImmutableList.of(a, b, c, d, e));
-
- // [START surprising_behavior_example_3]
- Query q = new Query("Widget").setFilter(new FilterPredicate("x", FilterOperator.NOT_EQUAL, 1));
- // [END surprising_behavior_example_3]
-
- // The query matches any entity that has a some value other than 1. Only
- // entity "e" is not matched. See the documentation for more details:
- // https://cloud.google.com/appengine/docs/java/datastore/query-restrictions#properties_with_multiple_values_can_behave_in_surprising_ways
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(a, b, c, d);
- }
-
- @Test
- public void queryRestrictions_surprisingMultipleValuesTwoNotEquals_returnsMatchedEntities()
- throws Exception {
- Entity a = new Entity("Widget", "a");
- a.setProperty("x", ImmutableList.of(1L, 2L));
- Entity b = new Entity("Widget", "b");
- b.setProperty("x", ImmutableList.of(1L, 2L, 3L));
- datastore.put(ImmutableList.of(a, b));
-
- // [START surprising_behavior_example_4]
- Query q =
- new Query("Widget")
- .setFilter(
- CompositeFilterOperator.and(
- new FilterPredicate("x", FilterOperator.NOT_EQUAL, 1),
- new FilterPredicate("x", FilterOperator.NOT_EQUAL, 2)));
- // [END surprising_behavior_example_4]
-
- // The two NOT_EQUAL filters in the query become like the combination of queries:
- // x < 1 OR (x > 1 AND x < 2) OR x > 2
- //
- // Only "b" has some value which matches the "x > 2" portion of this query.
- //
- // See the documentation for more details:
- // https://cloud.google.com/appengine/docs/java/datastore/query-restrictions#properties_with_multiple_values_can_behave_in_surprising_ways
- List results =
- datastore.prepare(q.setKeysOnly()).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").containsExactly(b);
- }
-
- private Entity retrievePersonWithLastName(String targetLastName) {
- // [START single_retrieval_example]
- Query q =
- new Query("Person")
- .setFilter(new FilterPredicate("lastName", FilterOperator.EQUAL, targetLastName));
-
- PreparedQuery pq = datastore.prepare(q);
- Entity result = pq.asSingleEntity();
- // [END single_retrieval_example]
- return result;
- }
-
- @Test
- public void singleRetrievalExample_singleEntity_returnsEntity() throws Exception {
- Entity a = new Entity("Person", "a");
- a.setProperty("lastName", "Johnson");
- Entity b = new Entity("Person", "b");
- b.setProperty("lastName", "Smith");
- datastore.put(ImmutableList.of(a, b));
-
- Entity result = retrievePersonWithLastName("Johnson");
-
- assertThat(result).named("result").isEqualTo(a); // Note: Entity.equals() only checks the Key.
- }
-
- @Test
- public void singleRetrievalExample_multitpleEntities_throwsException() throws Exception {
- Entity a = new Entity("Person", "a");
- a.setProperty("lastName", "Johnson");
- Entity b = new Entity("Person", "b");
- b.setProperty("lastName", "Johnson");
- datastore.put(ImmutableList.of(a, b));
-
- try {
- Entity result = retrievePersonWithLastName("Johnson");
- fail("Expected TooManyResultsException");
- } catch (TooManyResultsException expected) {
- // TooManyResultsException does not provide addition details.
- }
- }
-
- // [START query_limit_example]
- private List getTallestPeople() {
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- Query q = new Query("Person").addSort("height", SortDirection.DESCENDING);
-
- PreparedQuery pq = datastore.prepare(q);
- return pq.asList(FetchOptions.Builder.withLimit(5));
- }
- // [END query_limit_example]
-
- @Test
- public void queryLimitExample_returnsLimitedEntities() throws Exception {
- Entity a = new Entity("Person", "a");
- a.setProperty("height", 200);
- Entity b = new Entity("Person", "b");
- b.setProperty("height", 199);
- Entity c = new Entity("Person", "c");
- c.setProperty("height", 201);
- Entity d = new Entity("Person", "d");
- d.setProperty("height", 198);
- Entity e = new Entity("Person", "e");
- e.setProperty("height", 202);
- Entity f = new Entity("Person", "f");
- f.setProperty("height", 197);
- Entity g = new Entity("Person", "g");
- g.setProperty("height", 203);
- Entity h = new Entity("Person", "h");
- h.setProperty("height", 196);
- datastore.put(ImmutableList.of(a, b, c, d, e, f, g, h));
-
- List results = getTallestPeople();
-
- assertThat(results).named("results").containsExactly(g, e, c, a, b).inOrder();
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java b/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java
deleted file mode 100644
index 0742a37acd1..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceConfig;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.ReadPolicy;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.common.collect.ImmutableList;
-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;
-
-/**
- * Unit tests for {@link ReadPolicy}.
- */
-@RunWith(JUnit4.class)
-public class ReadPolicyTest {
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set 100% eventual consistency, so we can test with other job policies.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(100));
-
- @Before
- public void setUp() {
- helper.setUp();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void readPolicy_eventual_returnsNoResults() {
- // [START data_consistency]
- double deadline = 5.0;
-
- // Construct a read policy for eventual consistency
- ReadPolicy policy = new ReadPolicy(ReadPolicy.Consistency.EVENTUAL);
-
- // Set the read policy
- DatastoreServiceConfig eventuallyConsistentConfig =
- DatastoreServiceConfig.Builder.withReadPolicy(policy);
-
- // Set the call deadline
- DatastoreServiceConfig deadlineConfig = DatastoreServiceConfig.Builder.withDeadline(deadline);
-
- // Set both the read policy and the call deadline
- DatastoreServiceConfig datastoreConfig =
- DatastoreServiceConfig.Builder.withReadPolicy(policy).deadline(deadline);
-
- // Get Datastore service with the given configuration
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(datastoreConfig);
- // [END data_consistency]
-
- Entity parent = new Entity("Person", "a");
- Entity child = new Entity("Person", "b", parent.getKey());
- datastore.put(ImmutableList.of(parent, child));
-
- // Even though we are using an ancestor query, the policy is set to
- // eventual, so we should get eventually-consistent results. Since the
- // local data store test config is set to 100% unapplied jobs, there
- // should be no results.
- Query q = new Query("Person").setAncestor(parent.getKey());
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").isEmpty();
- }
-
- @Test
- public void readPolicy_strong_returnsAllResults() {
- double deadline = 5.0;
- ReadPolicy policy = new ReadPolicy(ReadPolicy.Consistency.STRONG);
- DatastoreServiceConfig datastoreConfig =
- DatastoreServiceConfig.Builder.withReadPolicy(policy).deadline(deadline);
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(datastoreConfig);
-
- Entity parent = new Entity("Person", "a");
- Entity child = new Entity("Person", "b", parent.getKey());
- datastore.put(ImmutableList.of(parent, child));
-
- Query q = new Query("Person").setAncestor(parent.getKey());
- List results = datastore.prepare(q).asList(FetchOptions.Builder.withDefaults());
- assertThat(results).named("query results").hasSize(2);
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java
deleted file mode 100644
index cf54f983097..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Query.Filter;
-import com.google.appengine.api.datastore.Query.FilterOperator;
-import com.google.appengine.api.datastore.Query.FilterPredicate;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link StartupServlet}.
- */
-@RunWith(JUnit4.class)
-public class StartupServletTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- @Mock private HttpServletRequest mockRequest;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private DatastoreService datastore;
-
- private StartupServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new StartupServlet();
- }
-
- @After
- public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_emptyDatastore_writesOkay() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
- assertThat(responseWriter.toString()).named("StartupServlet response").isEqualTo("ok\n");
- }
-
- @Test
- public void doGet_emptyDatastore_writesPresidents() throws Exception {
- servletUnderTest.doGet(mockRequest, mockResponse);
-
- Filter nameFilter = new FilterPredicate("name", FilterOperator.EQUAL, "George Washington");
- Query q = new Query("Person").setFilter(nameFilter);
- Entity result = datastore.prepare(q).asSingleEntity();
- assertThat(result.getProperty("name")).named("name").isEqualTo("George Washington");
- }
-
- @Test
- public void doGet_alreadyPopulated_writesOkay() throws Exception {
- datastore.put(
- new Entity(StartupServlet.IS_POPULATED_ENTITY, StartupServlet.IS_POPULATED_KEY_NAME));
- servletUnderTest.doGet(mockRequest, mockResponse);
- assertThat(responseWriter.toString()).named("StartupServlet response").isEqualTo("ok\n");
- }
-}
diff --git a/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java b/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java
deleted file mode 100644
index 6247f3fe06c..00000000000
--- a/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Transaction;
-import com.google.appengine.api.datastore.TransactionOptions;
-import com.google.appengine.api.taskqueue.Queue;
-import com.google.appengine.api.taskqueue.QueueFactory;
-import com.google.appengine.api.taskqueue.TaskOptions;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-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.ConcurrentModificationException;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Unit tests to demonstrate App Engine Datastore transactions.
- */
-@RunWith(JUnit4.class)
-public class TransactionsTest {
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Use High Rep job policy to allow cross group transactions in tests.
- new LocalDatastoreServiceTestConfig().setApplyAllHighRepJobPolicy());
-
- private DatastoreService datastore;
-
- @Before
- public void setUp() {
- helper.setUp();
- datastore = DatastoreServiceFactory.getDatastoreService();
- }
-
- @After
- public void tearDown() {
- // Clean up any dangling transactions.
- Transaction txn = datastore.getCurrentTransaction(null);
- if (txn != null && txn.isActive()) {
- txn.rollback();
- }
- helper.tearDown();
- }
-
- @Test
- public void usingTransactions() throws Exception {
- Entity joe = new Entity("Employee", "Joe");
- datastore.put(joe);
-
- // [START using_transactions]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- Transaction txn = datastore.beginTransaction();
- try {
- Key employeeKey = KeyFactory.createKey("Employee", "Joe");
- Entity employee = datastore.get(employeeKey);
- employee.setProperty("vacationDays", 10);
-
- datastore.put(txn, employee);
-
- txn.commit();
- } finally {
- if (txn.isActive()) {
- txn.rollback();
- }
- }
- // [END using_transactions]
- }
-
- @Test
- public void entityGroups() throws Exception {
- try {
- // [START entity_groups]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- Entity person = new Entity("Person", "tom");
- datastore.put(person);
-
- // Transactions on root entities
- Transaction txn = datastore.beginTransaction();
-
- Entity tom = datastore.get(person.getKey());
- tom.setProperty("age", 40);
- datastore.put(txn, tom);
- txn.commit();
-
- // Transactions on child entities
- txn = datastore.beginTransaction();
- tom = datastore.get(person.getKey());
- Entity photo = new Entity("Photo", tom.getKey());
-
- // Create a Photo that is a child of the Person entity named "tom"
- photo.setProperty("photoUrl", "http://domain.com/path/to/photo.jpg");
- datastore.put(txn, photo);
- txn.commit();
-
- // Transactions on entities in different entity groups
- txn = datastore.beginTransaction();
- tom = datastore.get(person.getKey());
- Entity photoNotAChild = new Entity("Photo");
- photoNotAChild.setProperty("photoUrl", "http://domain.com/path/to/photo.jpg");
- datastore.put(txn, photoNotAChild);
-
- // Throws IllegalArgumentException because the Person entity
- // and the Photo entity belong to different entity groups.
- txn.commit();
- // [END entity_groups]
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException expected) {
- // We expect to get an exception that complains that we don't have a XG-transaction.
- }
- }
-
- @Test
- public void creatingAnEntityInASpecificEntityGroup() throws Exception {
- String boardName = "my-message-board";
-
- // [START creating_an_entity_in_a_specific_entity_group]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-
- String messageTitle = "Some Title";
- String messageText = "Some message.";
- Date postDate = new Date();
-
- Transaction txn = datastore.beginTransaction();
-
- Key messageBoardKey = KeyFactory.createKey("MessageBoard", boardName);
-
- Entity message = new Entity("Message", messageBoardKey);
- message.setProperty("message_title", messageTitle);
- message.setProperty("message_text", messageText);
- message.setProperty("post_date", postDate);
- datastore.put(txn, message);
-
- txn.commit();
- // [END creating_an_entity_in_a_specific_entity_group]
- }
-
- @Test
- public void crossGroupTransactions() throws Exception {
- // [START cross-group_XG_transactions_using_the_Java_low-level_API]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- TransactionOptions options = TransactionOptions.Builder.withXG(true);
- Transaction txn = datastore.beginTransaction(options);
-
- Entity a = new Entity("A");
- a.setProperty("a", 22);
- datastore.put(txn, a);
-
- Entity b = new Entity("B");
- b.setProperty("b", 11);
- datastore.put(txn, b);
-
- txn.commit();
- // [END cross-group_XG_transactions_using_the_Java_low-level_API]
- }
-
- @Test
- public void usesForTransactions_relativeUpdates() throws Exception {
- String boardName = "my-message-board";
- Entity b = new Entity("MessageBoard", boardName);
- b.setProperty("count", 41);
- datastore.put(b);
-
- // [START uses_for_transactions_1]
- int retries = 3;
- while (true) {
- Transaction txn = datastore.beginTransaction();
- try {
- Key boardKey = KeyFactory.createKey("MessageBoard", boardName);
- Entity messageBoard = datastore.get(boardKey);
-
- long count = (Long) messageBoard.getProperty("count");
- ++count;
- messageBoard.setProperty("count", count);
- datastore.put(txn, messageBoard);
-
- txn.commit();
- break;
- } catch (ConcurrentModificationException e) {
- if (retries == 0) {
- throw e;
- }
- // Allow retry to occur
- --retries;
- } finally {
- if (txn.isActive()) {
- txn.rollback();
- }
- }
- }
- // [END uses_for_transactions_1]
-
- b = datastore.get(KeyFactory.createKey("MessageBoard", boardName));
- assertThat((long) b.getProperty("count")).named("board.count").isEqualTo(42L);
- }
-
- private Entity fetchOrCreate(String boardName) {
- // [START uses_for_transactions_2]
- Transaction txn = datastore.beginTransaction();
- Entity messageBoard;
- Key boardKey;
- try {
- boardKey = KeyFactory.createKey("MessageBoard", boardName);
- messageBoard = datastore.get(boardKey);
- } catch (EntityNotFoundException e) {
- messageBoard = new Entity("MessageBoard", boardName);
- messageBoard.setProperty("count", 0L);
- boardKey = datastore.put(txn, messageBoard);
- }
- txn.commit();
- // [END uses_for_transactions_2]
-
- return messageBoard;
- }
-
- @Test
- public void usesForTransactions_fetchOrCreate_fetchesExisting() throws Exception {
- Entity b = new Entity("MessageBoard", "my-message-board");
- b.setProperty("count", 7);
- datastore.put(b);
-
- Entity board = fetchOrCreate("my-message-board");
-
- assertThat((long) board.getProperty("count")).named("board.count").isEqualTo(7L);
- }
-
- @Test
- public void usesForTransactions_fetchOrCreate_createsNew() throws Exception {
- Entity board = fetchOrCreate("my-message-board");
- assertThat((long) board.getProperty("count")).named("board.count").isEqualTo(0L);
- }
-
- @Test
- public void usesForTransactions_readSnapshot() throws Exception {
- String boardName = "my-message-board";
- Entity b = new Entity("MessageBoard", boardName);
- b.setProperty("count", 13);
- datastore.put(b);
-
- // [START uses_for_transactions_3]
- DatastoreService ds = DatastoreServiceFactory.getDatastoreService();
-
- // Display information about a message board and its first 10 messages.
- Key boardKey = KeyFactory.createKey("MessageBoard", boardName);
-
- Transaction txn = datastore.beginTransaction();
-
- Entity messageBoard = datastore.get(boardKey);
- long count = (Long) messageBoard.getProperty("count");
-
- Query q = new Query("Message", boardKey);
-
- // This is an ancestor query.
- PreparedQuery pq = datastore.prepare(txn, q);
- List messages = pq.asList(FetchOptions.Builder.withLimit(10));
-
- txn.commit();
- // [END uses_for_transactions_3]
-
- assertThat(count).named("board.count").isEqualTo(13L);
- }
-
- @Test
- public void transactionalTaskEnqueuing() throws Exception {
- // [START transactional_task_enqueuing]
- DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
- Queue queue = QueueFactory.getDefaultQueue();
- Transaction txn = datastore.beginTransaction();
- // ...
-
- queue.add(TaskOptions.Builder.withUrl("/path/to/handler"));
-
- // ...
-
- txn.commit();
- // [END transactional_task_enqueuing]
- }
-}
diff --git a/appengine/firebase-event-proxy/README.md b/appengine/firebase-event-proxy/README.md
deleted file mode 100644
index eeb8b4ac107..00000000000
--- a/appengine/firebase-event-proxy/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# App Engine Firebase Event Proxy
-
-An example app that illustrates how to create a Java App Engine Standard Environment
-app that proxies Firebase events to another App Engine app.
-
-# Java Firebase Event Proxy
-Illustrates how to authenticate and subscribe to Firebase from Java App Engine.
-
-# Python App Engine Listener
-Illustrates how to authenticate messages received from the proxy app.
-
-## Setup
-
-### Java Firebase Event Proxy
-Firebase Secret
-Put your Firebase secret in the file:
-gae-firebase-event-proxy/src/main/webapp/firebase-secret.properties
-```
-firebaseSecret=
-```
-
-* Billing must be enabled from Cloud console.
-* Manual scaling should turned on and configured to 1 instance in appengine-web.xml
-
-## Running locally
-### Java Firebase Event Proxy
-```
-cd gae-firebase-event-proxy
-mvn appengine:devserver
-```
-
-### Python App Engine Listener
-```
-cd gae-firebase-listener-python
-dev_appserver .
-```
-
-## Deploying
-
-### Java Firebase Event Proxy
-```
-cd gae-firebase-event-proxy
-mvn appengine:upload
-```
-
-### Python App Engine Listener
-```
-appcfg.py -A -V v1 update gae-firebase-listener-python
-```
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
deleted file mode 100644
index 9f062705dce..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
-
- com.example.gaefirebaseeventproxy
- gaefirebaseeventproxy
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../../..
-
-
-
- gae-firebase-event-proxy
- 1
- UTF-8
- true
-
-
-
- 3.1.0
-
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- jstl
- jstl
- 1.2
-
-
- com.google.firebase
- firebase-server-sdk
- 3.0.1
-
-
- com.fasterxml.jackson.core
- jackson-core
- 2.8.1
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.8.1
-
-
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
- false
- ${app.version}
-
-
-
-
-
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
deleted file mode 100644
index bd706ba03e4..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.gaefirebaseeventproxy;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.appengine.api.utils.SystemProperty;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-public class FirebaseEventProxy {
-
- private static final Logger log = Logger.getLogger(FirebaseEventProxy.class.getName());
-
- public FirebaseEventProxy() {
- String firebaseLocation = "https://crackling-torch-392.firebaseio.com";
- Map databaseAuthVariableOverride = new HashMap();
- // uid and provider will have to match what you have in your firebase security rules
- databaseAuthVariableOverride.put("uid", "gae-firebase-event-proxy");
- databaseAuthVariableOverride.put("provider", "com.example");
- try {
- FirebaseOptions options = new FirebaseOptions.Builder()
- .setServiceAccount(new FileInputStream("gae-firebase-secrets.json"))
- .setDatabaseUrl(firebaseLocation)
- .setDatabaseAuthVariableOverride(databaseAuthVariableOverride).build();
- FirebaseApp.initializeApp(options);
- } catch (IOException e) {
- throw new RuntimeException(
- "Error reading firebase secrets from file: src/main/webapp/gae-firebase-secrets.json: "
- + e.getMessage());
- }
- }
-
- public void start() {
- DatabaseReference firebase = FirebaseDatabase.getInstance().getReference();
-
- // Subscribe to value events. Depending on use case, you may want to subscribe to child events
- // through childEventListener.
- firebase.addValueEventListener(new ValueEventListener() {
- @Override
- public void onDataChange(DataSnapshot snapshot) {
- if (snapshot.exists()) {
- try {
- // Convert value to JSON using Jackson
- String json = new ObjectMapper().writeValueAsString(snapshot.getValue(false));
-
- // Replace the URL with the url of your own listener app.
- URL dest = new URL("http://gae-firebase-listener-python.appspot.com/log");
- HttpURLConnection connection = (HttpURLConnection) dest.openConnection();
- connection.setRequestMethod("POST");
- connection.setDoOutput(true);
-
- // Rely on X-Appengine-Inbound-Appid to authenticate. Turning off redirects is
- // required to enable.
- connection.setInstanceFollowRedirects(false);
-
- // Fill out header if in dev environment
- if (SystemProperty.environment.value() != SystemProperty.Environment.Value.Production) {
- connection.setRequestProperty("X-Appengine-Inbound-Appid", "dev-instance");
- }
-
- // Put Firebase data into http request
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("&fbSnapshot=");
- stringBuilder.append(URLEncoder.encode(json, "UTF-8"));
- connection.getOutputStream().write(stringBuilder.toString().getBytes());
- if (connection.getResponseCode() != 200) {
- log.severe("Forwarding failed");
- } else {
- log.info("Sent: " + json);
- }
- } catch (JsonProcessingException e) {
- log.severe("Unable to convert Firebase response to JSON: " + e.getMessage());
- } catch (IOException e) {
- log.severe("Error in connecting to app engine: " + e.getMessage());
- }
- }
- }
-
- @Override
- public void onCancelled(DatabaseError error) {
- log.severe("Firebase connection cancelled: " + error.getMessage());
- }
- });
- }
-}
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
deleted file mode 100644
index ffee0cee769..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.gaefirebaseeventproxy;
-
-import java.util.logging.Logger;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-// ServletContextListener that is called whenever your App Engine app starts up.
-public class ServletContextListenerImpl implements ServletContextListener {
-
- private static final Logger log = Logger.getLogger(ServletContextListener.class.getName());
-
- @Override
- public void contextInitialized(ServletContextEvent event) {
- log.info("Starting ....");
- FirebaseEventProxy proxy = new FirebaseEventProxy();
- proxy.start();
- }
-
- @Override
- public void contextDestroyed(ServletContextEvent event) {
- // App Engine does not currently invoke this method.
- }
-}
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index dcf0932551f..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- ${app.id}
- ${app.version}
- true
-
-
- 1
-
-
-
-
-
-
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index e325f6cb079..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 Google Inc. All rights reserved.
-#
-# 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.
-
-# A default java.util.logging configuration.
-# (All App Engine logging is through java.util.logging by default).
-#
-# To use this configuration, copy it into your application's WEB-INF
-# folder and add the following to your appengine-web.xml:
-#
-#
-#
-#
-#
-
-# Set the default logging level for all loggers to WARNING
-.level = INFO
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 427fd14c909..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- com.example.gaefirebaseeventproxy.ServletContextListenerImpl
-
-
- index.jsp
-
-
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
deleted file mode 100644
index ffc7d85f599..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%--
-Copyright 2015 Google Inc. All Rights Reserved.
-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.
---%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-
-
-
-
-
-
-
Status: up
-
-
-
diff --git a/appengine/firebase-event-proxy/gae-firebase-listener-python/.gitignore b/appengine/firebase-event-proxy/gae-firebase-listener-python/.gitignore
deleted file mode 100644
index 0d20b6487c6..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-listener-python/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/appengine/firebase-event-proxy/gae-firebase-listener-python/app.yaml b/appengine/firebase-event-proxy/gae-firebase-listener-python/app.yaml
deleted file mode 100644
index f041d384c05..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-listener-python/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: python27
-api_version: 1
-threadsafe: true
-
-handlers:
-- url: /.*
- script: main.app
diff --git a/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py b/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py
deleted file mode 100644
index 49145bbd749..00000000000
--- a/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016 Google Inc. All rights reserved.
-#
-# 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.
-
-import os
-import webapp2
-
-IS_DEV = os.environ["SERVER_SOFTWARE"][:3] == "Dev"
-allowed_users = set()
-if IS_DEV:
- allowed_users.add("dev-instance")
-else:
- # Add your Java App Engine proxy App Id here
- allowed_users.add("your-java-appengine-proxy-app-id")
-
-class LoggingHandler(webapp2.RequestHandler):
-
- def post(self):
- user = self.request.headers.get('X-Appengine-Inbound-Appid', None)
- if user and user in allowed_users:
- firebaseSnapshot = self.request.params['fbSnapshot']
- print firebaseSnapshot
- else:
- print "Got unauthenticated user: %s" % user
-
-app = webapp2.WSGIApplication([
- webapp2.Route('/log', LoggingHandler),
-])
diff --git a/appengine/guestbook-objectify/README.md b/appengine/guestbook-objectify/README.md
deleted file mode 100644
index 2a7ee9cd289..00000000000
--- a/appengine/guestbook-objectify/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# appengine/guestbook-objectify
-
-An App Engine guestbook using Java, Maven, and Objectify.
-
-Data access using [Objectify](https://github.com/objectify/objectify)
-
-Please ask questions on [Stackoverflow](http://stackoverflow.com/questions/tagged/google-app-engine)
-
-## Running Locally
-
-How do I, as a developer, start working on the project?
-
-1. `mvn clean appengine:devserver`
-
-## Deploying
-
-1. `mvn clean appengine:update -Dappengine.appId=PROJECT -Dappengine.version=VERSION`
diff --git a/appengine/guestbook-objectify/pom.xml b/appengine/guestbook-objectify/pom.xml
deleted file mode 100644
index 12946aace0d..00000000000
--- a/appengine/guestbook-objectify/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
-
- com.example.appengine
- appengine-guestbook-objectify
-
- 5.1.5
- 18.0
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
- 3.3.9
-
-
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- jstl
- jstl
- 1.2
-
-
-
-
- com.google.guava
- guava
- ${guava.version}
-
-
- com.googlecode.objectify
- objectify
- ${objectify.version}
-
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
- false
-
-
-
-
-
-
-
-
-
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
deleted file mode 100644
index 29c37d066ce..00000000000
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-//[START all]
-package com.example.guestbook;
-
-import com.googlecode.objectify.Key;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Id;
-import com.googlecode.objectify.annotation.Index;
-import com.googlecode.objectify.annotation.Parent;
-
-import java.lang.String;
-import java.util.Date;
-
-/**
- * The @Entity tells Objectify about our entity. We also register it in {@link OfyHelper}
- * Our primary key @Id is set automatically by the Google Datastore for us.
- *
- * We add a @Parent to tell the object about its ancestor. We are doing this to support many
- * guestbooks. Objectify, unlike the AppEngine library requires that you specify the fields you
- * want to index using @Index. Only indexing the fields you need can lead to substantial gains in
- * performance -- though if not indexing your data from the start will require indexing it later.
- *
- * NOTE - all the properties are PUBLIC so that can keep the code simple.
- **/
-@Entity
-public class Greeting {
- @Parent Key theBook;
- @Id public Long id;
-
- public String authorEmail;
- public String authorId;
- public String content;
- @Index public Date date;
-
- /**
- * Simple constructor just sets the date.
- **/
- public Greeting() {
- date = new Date();
- }
-
- /**
- * A convenience constructor.
- **/
- public Greeting(String book, String content) {
- this();
- if ( book != null ) {
- theBook = Key.create(Guestbook.class, book); // Creating the Ancestor key
- } else {
- theBook = Key.create(Guestbook.class, "default");
- }
- this.content = content;
- }
-
- /**
- * Takes all important fields.
- **/
- public Greeting(String book, String content, String id, String email) {
- this(book, content);
- authorEmail = email;
- authorId = id;
- }
-
-}
-//[END all]
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
deleted file mode 100644
index 73786e00249..00000000000
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-//[START all]
-package com.example.guestbook;
-
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Id;
-
-/**
- * The @Entity tells Objectify about our entity. We also register it in
- * OfyHelper.java -- very important.
- *
- * This is never actually created, but gives a hint to Objectify about our Ancestor key.
- */
-@Entity
-public class Guestbook {
- @Id public String book;
-}
-//[END all]
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
deleted file mode 100644
index a5837295656..00000000000
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-//[START all]
-package com.example.guestbook;
-
-import com.googlecode.objectify.ObjectifyService;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-/**
- * OfyHelper, a ServletContextListener, is setup in web.xml to run before a JSP is run. This is
- * required to let JSP's access Ofy.
- **/
-public class OfyHelper implements ServletContextListener {
- public void contextInitialized(ServletContextEvent event) {
- // This will be invoked as part of a warmup request, or the first user request if no warmup
- // request.
- ObjectifyService.register(Guestbook.class);
- ObjectifyService.register(Greeting.class);
- }
-
- public void contextDestroyed(ServletContextEvent event) {
- // App Engine does not currently invoke this method.
- }
-}
-//[END all]
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
deleted file mode 100644
index 2b7d368642a..00000000000
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-//[START all]
-package com.example.guestbook;
-
-import com.google.appengine.api.users.User;
-import com.google.appengine.api.users.UserService;
-import com.google.appengine.api.users.UserServiceFactory;
-
-import com.googlecode.objectify.ObjectifyService;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Form Handling Servlet - most of the action for this sample is in webapp/guestbook.jsp,
- * which displays the {@link Greeting}'s.
- */
-public class SignGuestbookServlet extends HttpServlet {
-
- // Process the http POST of the form
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws IOException {
- Greeting greeting;
-
- UserService userService = UserServiceFactory.getUserService();
- User user = userService.getCurrentUser(); // Find out who the user is.
-
- String guestbookName = req.getParameter("guestbookName");
- String content = req.getParameter("content");
- if (user != null) {
- greeting = new Greeting(guestbookName, content, user.getUserId(), user.getEmail());
- } else {
- greeting = new Greeting(guestbookName, content);
- }
-
- // Use Objectify to save the greeting and now() is used to make the call synchronously as we
- // will immediately get a new page using redirect and we want the data to be present.
- ObjectifyService.ofy().save().entity(greeting).now();
-
- resp.sendRedirect("/guestbook.jsp?guestbookName=" + guestbookName);
- }
-}
-//[END all]
diff --git a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 8bf645d1013..00000000000
--- a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- your-app-id
- ${appengine.app.version}
- true
-
-
-
-
-
diff --git a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/logging.properties b/appengine/guestbook-objectify/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index a17206681f0..00000000000
--- a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# A default java.util.logging configuration.
-# (All App Engine logging is through java.util.logging by default).
-#
-# To use this configuration, copy it into your application's WEB-INF
-# folder and add the following to your appengine-web.xml:
-#
-#
-#
-#
-#
-
-# Set the default logging level for all loggers to WARNING
-.level = WARNING
diff --git a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/web.xml b/appengine/guestbook-objectify/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d5a23626f0c..00000000000
--- a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- sign
- com.example.guestbook.SignGuestbookServlet
-
-
-
- sign
- /sign
-
-
-
- guestbook.jsp
-
-
-
-
-
- ObjectifyFilter
- com.googlecode.objectify.ObjectifyFilter
-
-
- ObjectifyFilter
- /*
-
-
- com.example.guestbook.OfyHelper
-
-
-
diff --git a/appengine/guestbook-objectify/src/main/webapp/guestbook.jsp b/appengine/guestbook-objectify/src/main/webapp/guestbook.jsp
deleted file mode 100644
index 481274ceb84..00000000000
--- a/appengine/guestbook-objectify/src/main/webapp/guestbook.jsp
+++ /dev/null
@@ -1,106 +0,0 @@
-<%-- //[START all]--%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="com.google.appengine.api.users.User" %>
-<%@ page import="com.google.appengine.api.users.UserService" %>
-<%@ page import="com.google.appengine.api.users.UserServiceFactory" %>
-
-<%-- //[START imports]--%>
-<%@ page import="com.example.guestbook.Greeting" %>
-<%@ page import="com.example.guestbook.Guestbook" %>
-<%@ page import="com.googlecode.objectify.Key" %>
-<%@ page import="com.googlecode.objectify.ObjectifyService" %>
-<%-- //[END imports]--%>
-
-<%@ page import="java.util.List" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
-
-
-
-
-
-
-<%
- String guestbookName = request.getParameter("guestbookName");
- if (guestbookName == null) {
- guestbookName = "default";
- }
- pageContext.setAttribute("guestbookName", guestbookName);
- UserService userService = UserServiceFactory.getUserService();
- User user = userService.getCurrentUser();
- if (user != null) {
- pageContext.setAttribute("user", user);
-%>
-
-
Hello, ${fn:escapeXml(user.nickname)}! (You can
- sign out.)
-<%
- } else {
-%>
-
Hello!
- Sign in
- to include your name with greetings you post.
-<%
- }
-%>
-
-<%-- //[START datastore]--%>
-<%
- // Create the correct Ancestor key
- Key theBook = Key.create(Guestbook.class, guestbookName);
-
- // Run an ancestor query to ensure we see the most up-to-date
- // view of the Greetings belonging to the selected Guestbook.
- List greetings = ObjectifyService.ofy()
- .load()
- .type(Greeting.class) // We want only Greetings
- .ancestor(theBook) // Anyone in this book
- .order("-date") // Most recent first - date is indexed.
- .limit(5) // Only show 5 of them.
- .list();
-
- if (greetings.isEmpty()) {
-%>
-
Guestbook '${fn:escapeXml(guestbookName)}' has no messages.
-<%
- } else {
-%>
-
Messages in Guestbook '${fn:escapeXml(guestbookName)}'.
-<%
- }
- }
-%>
-
-
-<%-- //[END datastore]--%>
-
-
-
-
-<%-- //[END all]--%>
diff --git a/appengine/guestbook-objectify/src/main/webapp/stylesheets/main.css b/appengine/guestbook-objectify/src/main/webapp/stylesheets/main.css
deleted file mode 100644
index 05d72d5536d..00000000000
--- a/appengine/guestbook-objectify/src/main/webapp/stylesheets/main.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
- font-family: Verdana, Helvetica, sans-serif;
- background-color: #FFFFCC;
-}
diff --git a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java
deleted file mode 100644
index 085c1778275..00000000000
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.GuestbookTestUtilities.cleanDatastore;
-import static org.junit.Assert.assertEquals;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
-import com.googlecode.objectify.ObjectifyService;
-import com.googlecode.objectify.util.Closeable;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-
-@RunWith(JUnit4.class)
-public class GreetingTest {
- private static final String TEST_CONTENT = "The world is Blue today";
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private Closeable closeable;
- private DatastoreService ds;
-
- @Before
- public void setUp() throws Exception {
-
- helper.setUp();
- ds = DatastoreServiceFactory.getDatastoreService();
-
- ObjectifyService.register(Guestbook.class);
- ObjectifyService.register(Greeting.class);
-
- closeable = ObjectifyService.begin();
-
- cleanDatastore(ds, "default");
- }
-
- @After
- public void tearDown() {
- cleanDatastore(ds, "default");
- helper.tearDown();
- closeable.close();
- }
-
- @Test
- public void createSaveObject() throws Exception {
-
- Greeting g = new Greeting("default", TEST_CONTENT);
- ObjectifyService.ofy().save().entity(g).now();
-
- Query query = new Query("Greeting")
- .setAncestor(new KeyFactory.Builder("Guestbook", "default").getKey());
- PreparedQuery pq = ds.prepare(query);
- Entity greeting = pq.asSingleEntity(); // Should only be one at this point.
- assertEquals(greeting.getProperty("content"), TEST_CONTENT);
- }
-}
diff --git a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java
deleted file mode 100644
index 4480fd111bd..00000000000
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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 com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.FetchOptions;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class GuestbookTestUtilities {
-
- public static void cleanDatastore(DatastoreService ds, String book) {
- Query query = new Query("Greeting")
- .setAncestor(new KeyFactory.Builder("Guestbook", book)
- .getKey()).setKeysOnly();
- PreparedQuery pq = ds.prepare(query);
- List entities = pq.asList(FetchOptions.Builder.withDefaults());
- ArrayList keys = new ArrayList<>(entities.size());
-
- for (Entity e : entities) {
- keys.add(e.getKey());
- }
- ds.delete(keys);
- }
-
-}
diff --git a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
deleted file mode 100644
index 1c762be9511..00000000000
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.GuestbookTestUtilities.cleanDatastore;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
-import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
-import com.googlecode.objectify.ObjectifyService;
-import com.googlecode.objectify.util.Closeable;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link com.example.guestbook.SignGuestbookServlet}.
- */
-@RunWith(JUnit4.class)
-public class SignGuestbookServletTest {
- private static final String FAKE_URL = "fakey.org/sign";
- private static final String FAKE_NAME = "Fake";
-
- private final LocalServiceTestHelper helper =
- new LocalServiceTestHelper(
- // Set no eventual consistency, that way queries return all results.
- // https://cloud.google.com/appengine/docs/java/tools/localunittesting#Java_Writing_High_Replication_Datastore_tests
- new LocalDatastoreServiceTestConfig()
- .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
-
- private final String testPhrase = "Noew is the time";
-
- @Mock private HttpServletRequest mockRequest;
-
- @Mock
- private HttpServletResponse mockResponse;
-
- private StringWriter stringWriter;
- private SignGuestbookServlet servletUnderTest;
- private Closeable closeable;
- private DatastoreService ds;
-
- @Before
- public void setUp() throws Exception {
-
- MockitoAnnotations.initMocks(this);
- helper.setUp();
- ds = DatastoreServiceFactory.getDatastoreService();
-
- // Set up some fake HTTP requests
- when(mockRequest.getRequestURI()).thenReturn(FAKE_URL);
- when(mockRequest.getParameter("guestbookName")).thenReturn( "default" );
- when(mockRequest.getParameter("content")).thenReturn( testPhrase );
-
- stringWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(stringWriter));
-
- servletUnderTest = new SignGuestbookServlet();
-
- ObjectifyService.register(Guestbook.class);
- ObjectifyService.register(Greeting.class);
-
- closeable = ObjectifyService.begin();
-
- cleanDatastore(ds, "default");
- }
-
- @After public void tearDown() {
- cleanDatastore(ds, "default");
- helper.tearDown();
- closeable.close();
- }
-
- @Test
- public void doPost_userNotLoggedIn() throws Exception {
- servletUnderTest.doPost(mockRequest, mockResponse);
-
- Query query = new Query("Greeting")
- .setAncestor(new KeyFactory.Builder("Guestbook", "default").getKey());
- PreparedQuery pq = ds.prepare(query);
-
- Entity greeting = pq.asSingleEntity(); // Should only be one at this point.
- assertEquals(greeting.getProperty("content"), testPhrase);
- }
-
-}
diff --git a/appengine/helloworld/README.md b/appengine/helloworld/README.md
deleted file mode 100644
index 9cdb309b185..00000000000
--- a/appengine/helloworld/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Google App Engine Standard Environment Hello World Sample
-
-This sample demonstrates how to deploy an application on Google App Engine.
-
-See the [Google App Engine standard environment documentation][ae-docs] for more
-detailed instructions.
-
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-## Setup
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your project name.
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your version name.
-
-## Running locally
- $ mvn appengine:devserver
-
-## Deploying
- $ mvn appengine:update
diff --git a/appengine/helloworld/pom.xml b/appengine/helloworld/pom.xml
deleted file mode 100644
index af1b1b5899f..00000000000
--- a/appengine/helloworld/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-helloworld
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
-
diff --git a/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java b/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
deleted file mode 100644
index d9135a0ce63..00000000000
--- a/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.appengine.helloworld;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class HelloServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- PrintWriter out = resp.getWriter();
- out.println("Hello, world");
- }
-}
-// [END example]
diff --git a/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 468b6d0430a..00000000000
--- a/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
-
diff --git a/appengine/helloworld/src/main/webapp/WEB-INF/web.xml b/appengine/helloworld/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1a1704104a2..00000000000
--- a/appengine/helloworld/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- hello
- com.example.appengine.helloworld.HelloServlet
-
-
- hello
- /
-
-
diff --git a/appengine/images/README.md b/appengine/images/README.md
deleted file mode 100644
index 88edaa825f2..00000000000
--- a/appengine/images/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Google App Engine Standard Environment Images Sample
-
-This sample demonstrates how to use the Images Java API.
-
-See the [Google App Engine standard environment documentation][ae-docs] for more
-detailed instructions.
-
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-## Modify the app
-
-Using the [Google Cloud SDK](https://cloud.google.com/sdk/) create a bucket
-
- $ gsutil mb YOUR-PROJECT-ID.appspot.com
-
-* Edit `src/main/java/com/example/appengine/images/ImageServlet.java` and set your `bucket` name.
-
-## Running locally
-
- This example uses the
- [App Engine maven plugin](https://cloud.google.com/appengine/docs/java/tools/maven).
- To run this sample locally:
-
- $ mvn appengine:devserver
-
- To see the results of the sample application, open
- [localhost:8080](http://localhost:8080) in a web browser.
-
-
-## Deploying
-
- In the following command, replace YOUR-PROJECT-ID with your
- [Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber)
- and SOME-VERSION with a valid version number.
-
- $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml
deleted file mode 100644
index 8a977b97768..00000000000
--- a/appengine/images/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-images
-
-
- 1.9.24
-
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- com.google.appengine.tools
- appengine-gcs-client
- 0.6
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
deleted file mode 100644
index b7c9d853447..00000000000
--- a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.appengine.images;
-import com.google.appengine.api.blobstore.BlobKey;
-import com.google.appengine.api.blobstore.BlobstoreService;
-import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
-import com.google.appengine.api.images.Image;
-import com.google.appengine.api.images.ImagesService;
-import com.google.appengine.api.images.ImagesServiceFactory;
-import com.google.appengine.api.images.Transform;
-import com.google.appengine.tools.cloudstorage.GcsFileOptions;
-import com.google.appengine.tools.cloudstorage.GcsFilename;
-import com.google.appengine.tools.cloudstorage.GcsService;
-import com.google.appengine.tools.cloudstorage.GcsServiceFactory;
-import com.google.appengine.tools.cloudstorage.RetryParams;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class ImagesServlet extends HttpServlet {
- final String bucket = "YOUR-BUCKETNAME-HERE";
-
- // [START gcs]
- private final GcsService gcsService = GcsServiceFactory.createGcsService(new RetryParams.Builder()
- .initialRetryDelayMillis(10)
- .retryMaxAttempts(10)
- .totalRetryPeriodMillis(15000)
- .build());
- // [END gcs]
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-
- //[START original_image]
- // Read the image.jpg resource into a ByteBuffer.
- FileInputStream fileInputStream = new FileInputStream(new File("WEB-INF/image.jpg"));
- FileChannel fileChannel = fileInputStream.getChannel();
- ByteBuffer byteBuffer = ByteBuffer.allocate((int)fileChannel.size());
- fileChannel.read(byteBuffer);
-
- byte[] imageBytes = byteBuffer.array();
-
- // Write the original image to Cloud Storage
- gcsService.createOrReplace(
- new GcsFilename(bucket, "image.jpeg"),
- new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
- ByteBuffer.wrap(imageBytes));
- //[END original_image]
-
- //[START resize]
- // Get an instance of the imagesService we can use to transform images.
- ImagesService imagesService = ImagesServiceFactory.getImagesService();
-
- // Make an image directly from a byte array, and transform it.
- Image image = ImagesServiceFactory.makeImage(imageBytes);
- Transform resize = ImagesServiceFactory.makeResize(100, 50);
- Image resizedImage = imagesService.applyTransform(resize, image);
-
- // Write the transformed image back to a Cloud Storage object.
- gcsService.createOrReplace(
- new GcsFilename(bucket, "resizedImage.jpeg"),
- new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
- ByteBuffer.wrap(resizedImage.getImageData()));
- //[END resize]
-
- //[START rotate]
- // Make an image from a Cloud Storage object, and transform it.
- BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
- BlobKey blobKey = blobstoreService.createGsBlobKey("/gs/" + bucket + "/image.jpeg");
- Image blobImage = ImagesServiceFactory.makeImageFromBlob(blobKey);
- Transform rotate = ImagesServiceFactory.makeRotate(90);
- Image rotatedImage = imagesService.applyTransform(rotate, blobImage);
-
- // Write the transformed image back to a Cloud Storage object.
- gcsService.createOrReplace(
- new GcsFilename(bucket, "rotatedImage.jpeg"),
- new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
- ByteBuffer.wrap(rotatedImage.getImageData()));
- //[END rotate]
-
- // Output some simple HTML to display the images we wrote to Cloud Storage
- // in the browser.
- PrintWriter out = resp.getWriter();
- out.println("\n");
- out.println("");
- out.println("");
- out.println("");
- out.println("\n");
- }
-}
-// [END example]
diff --git a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 07bb4d7de99..00000000000
--- a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION
- true
-
diff --git a/appengine/images/src/main/webapp/WEB-INF/image.jpg b/appengine/images/src/main/webapp/WEB-INF/image.jpg
deleted file mode 100644
index 3a60da2619d..00000000000
Binary files a/appengine/images/src/main/webapp/WEB-INF/image.jpg and /dev/null differ
diff --git a/appengine/images/src/main/webapp/WEB-INF/web.xml b/appengine/images/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8ccba622877..00000000000
--- a/appengine/images/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- images
- com.example.appengine.images.ImagesServlet
-
-
- images
- /
-
-
diff --git a/appengine/logs/README.md b/appengine/logs/README.md
deleted file mode 100644
index 0d07745e5e8..00000000000
--- a/appengine/logs/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Users Authentication sample for Google App Engine
-
-This sample demonstrates how to use the [Logs API][log-docs] on [Google App
-Engine][ae-docs].
-
-[log-docs]: https://cloud.google.com/appengine/docs/java/logs/
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-## Running locally
-
-The Logs API only generates output for deployed apps, so this program should not be run locally.
-
-## Deploying
-
-This example uses the
-[Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
-
-In the following command, replace YOUR-PROJECT-ID with your
-[Google Cloud Project ID](https://support.google.com/cloud/answer/6158840) and SOME-VERSION with the desired version number.
-
- $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
-
-## Setup
-To save your project settings so that you don't need to enter the
- parameters, you can:
-
-1. Update the tag in src/main/webapp/WEB-INF/appengine-web.xml
- with your project name.
-
-2. Update the tag in src/main/webapp/WEB-INF/appengine-web.xml
- with a valid version number.
-
-
-You will now be able to run
-
- $ mvn appengine:update
-
-without the need for any additional parameters.
-
diff --git a/appengine/logs/pom.xml b/appengine/logs/pom.xml
deleted file mode 100644
index f76565189d9..00000000000
--- a/appengine/logs/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-logs
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${appengine.sdk.version}
-
-
- com.google.guava
- guava
- 19.0
-
-
- javax.servlet
- servlet-api
- 2.5
- jar
- provided
-
-
- org.json
- json
- 20160810
-
-
- joda-time
- joda-time
- 2.9.4
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java b/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
deleted file mode 100644
index 6ab30b504bd..00000000000
--- a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-// [START logs_API_example]
-package com.example.appengine.logs;
-
-import com.google.appengine.api.log.AppLogLine;
-import com.google.appengine.api.log.LogQuery;
-import com.google.appengine.api.log.LogServiceFactory;
-import com.google.appengine.api.log.RequestLogs;
-
-import org.joda.time.DateTime;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-// Get request logs along with their app log lines and display them 5 at
-// a time, using a Next link to cycle through to the next 5.
-public class LogsServlet extends HttpServlet {
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException {
-
- resp.setContentType("text/html");
- PrintWriter writer = resp.getWriter();
- writer.println("");
- writer.println("");
- writer.println("App Engine Logs Sample");
-
- // We use this to break out of our iteration loop, limiting record
- // display to 5 request logs at a time.
- int limit = 5;
-
- // This retrieves the offset from the Next link upon user click.
- String offset = req.getParameter("offset");
-
- // We want the App logs for each request log
- LogQuery query = LogQuery.Builder.withDefaults();
- query.includeAppLogs(true);
-
- // Set the offset value retrieved from the Next link click.
- if (offset != null) {
- query.offset(offset);
- }
-
- // This gets filled from the last request log in the iteration
- String lastOffset = null;
- int count = 0;
-
- // Display a few properties of each request log.
- for (RequestLogs record : LogServiceFactory.getLogService().fetch(query)) {
- writer.println(" REQUEST LOG ");
- DateTime reqTime = new DateTime(record.getStartTimeUsec() / 1000);
- writer.println("IP: " + record.getIp() + " ");
- writer.println("Method: " + record.getMethod() + " ");
- writer.println("Resource " + record.getResource() + " ");
- writer.println(String.format(" Date: %s", reqTime.toString()));
-
- lastOffset = record.getOffset();
-
- // Display all the app logs for each request log.
- for (AppLogLine appLog : record.getAppLogLines()) {
- writer.println(" " + "APPLICATION LOG" + " ");
- DateTime appTime = new DateTime(appLog.getTimeUsec() / 1000);
- writer.println(String.format(" Date: %s", appTime.toString()));
- writer.println(" Level: " + appLog.getLogLevel() + " ");
- writer.println("Message: " + appLog.getLogMessage() + "
");
- }
-
- if (++count >= limit) {
- break;
- }
- }
-
- // When the user clicks this link, the offset is processed in the
- // GET handler and used to cycle through to the next 5 request logs.
- writer.println(String.format(" Next", lastOffset));
- }
-}
-// [END logs_API_example]
-
diff --git a/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 73eefaee076..00000000000
--- a/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-NUMBER
- true
-
-
-
-
diff --git a/appengine/logs/src/main/webapp/WEB-INF/logging.properties b/appengine/logs/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index 3e7f85b9dc1..00000000000
--- a/appengine/logs/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# A default java.util.logging configuration.
-# (All App Engine logging is through java.util.logging by default).
-#
-# To use this configuration, copy it into your application's WEB-INF
-# folder and add the following to your appengine-web.xml:
-#
-#
-#
-#
-#
-
-# Set the default logging level for all loggers to WARNING
-.level = WARNING
-
diff --git a/appengine/logs/src/main/webapp/WEB-INF/web.xml b/appengine/logs/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index fa2cb4457c4..00000000000
--- a/appengine/logs/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- logs
- com.example.appengine.logs.LogsServlet
-
-
- logs
- /
-
-
diff --git a/appengine/mail/pom.xml b/appengine/mail/pom.xml
index 19318a04121..0aa14fa0080 100644
--- a/appengine/mail/pom.xml
+++ b/appengine/mail/pom.xml
@@ -43,6 +43,11 @@ Copyright 2016 Google Inc. All Rights Reserved.
javax.mailmail1.4.7
+
+
+ com.google.cloud
+ gcloud-java
+ 0.2.7
diff --git a/appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java b/appengine/mail/src/main/java/com/example/appengine/mail/SendEmail.java
similarity index 100%
rename from appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java
rename to appengine/mail/src/main/java/com/example/appengine/mail/SendEmail.java
diff --git a/appengine/mail/src/main/java/com/example/appengine/mail/SpreadsheetInfo.java b/appengine/mail/src/main/java/com/example/appengine/mail/SpreadsheetInfo.java
new file mode 100644
index 00000000000..2fb68a2d2a1
--- /dev/null
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/SpreadsheetInfo.java
@@ -0,0 +1,202 @@
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import com.google.gdata.client.spreadsheet.CellQuery;
+import com.google.gdata.client.spreadsheet.FeedURLFactory;
+import com.google.gdata.client.spreadsheet.SpreadsheetService;
+import com.google.gdata.data.spreadsheet.Cell;
+import com.google.gdata.data.spreadsheet.CellEntry;
+import com.google.gdata.data.spreadsheet.CellFeed;
+import com.google.gdata.data.spreadsheet.SpreadsheetEntry;
+import com.google.gdata.data.spreadsheet.SpreadsheetFeed;
+import com.google.gdata.data.spreadsheet.WorksheetEntry;
+import com.google.gdata.util.AuthenticationException;
+import com.google.gdata.util.ServiceException;
+
+public class SpreadsheetInfo {
+ private static final FeedURLFactory urlFactory = FeedURLFactory.getDefault();
+
+ private SpreadsheetService service;
+
+
+ // ==========================================================================
+ // CONNECT to Google Spreadsheet API
+
+ /** Opens a connection to Google spreadsheet API. */
+ public void connect() {
+ SpreadsheetService newService = new SpreadsheetService("application_name");
+ // Google account login and passwords to access your spreadsheet.
+ // Password is in plain text. For sure there are better ways to do that
+ // so the passwords does not have to be in the code, but the simplest.
+ String email = "user@example.com";
+ String password = "password";
+ try {
+ newService.setUserCredentials(email, password);
+ } catch (AuthenticationException e) {
+ throw new RuntimeException("Cannot authenticate, invalid user/password", e);
+ }
+ this.service = newService;
+ }
+
+
+ // ==========================================================================
+ // Load data
+
+ /**
+ * Loads data from the sheet.
+ * @returns List of all non empty values in the first sheet column as
+ * 'row_number:value', where row_number=1,2,...
+ */
+ public List loadExampleData() {
+ CellFeed cellFeed = getCellFeed();
+ List result = new ArrayList();
+ for (CellEntry entry : cellFeed.getEntries()) {
+ Cell cell = entry.getCell();
+ if (cell.getCol() == 1) {
+ String value = cell.getRow() + cell.getValue();
+ result.add(value);
+ }
+ }
+ return result;
+ }
+
+
+ // ==========================================================================
+ // Save data
+
+ /**
+ * Sets new cell value for column=1 in given row.
+ * @param row Row number, if the sheet does not have so many row, new empty
+ * rows will be added.
+ * @param value New cell value as a text
+ */
+ public void setExampleValue(int row, String value) {
+ extendSheetIfTooShort(row);
+ CellFeed cellFeed = getCellFeedForUpdate(row, row, 1, 1);
+ updateCell(cellFeed.getEntries().get(0), value);
+ }
+
+
+ // ==========================================================================
+ // Access a worksheet in CELL mode
+
+ /**
+ * Returns CellFeed connected to predefined, existing spreadsheet and a
+ * sheet inside it.
+ * Provided CellFeed will include only non empty cells.
+ * This method is convenient for reading, but not always so good for updating
+ * (you do not see all cells).
+ */
+ private CellFeed getCellFeed() {
+ try {
+ return service.getFeed(findWorksheet().getCellFeedUrl(), CellFeed.class);
+ } catch (ServiceException e) {
+ throw new RuntimeException("Service error when loading data", e);
+ } catch (IOException e) {
+ throw new RuntimeException("Connection with server broken", e);
+ }
+ }
+
+ /**
+ * Returns CellFeed for update connected to predefined, existing spreadsheet
+ * and a sheet inside it.
+ * Provided CellFeed will include all existing cells within given row and
+ * column range. Note that sheet can be smaller than specified ranges, then
+ * provided CellFeed will only include ranges up to the sheet size.
+ * This method is convenient for updating, but not always so good for reading
+ * (you can have a lot of empty cells).
+ * @param minRow Min row number (inclusive) - 1,2,...
+ * @param maxRow Max row number (inclusive) - 1,2,...
+ * @param minCol Min column number (inclusive) - 1,2,...
+ * @param maxCol Max column number (inclusive) - 1,2,...
+ */
+ private CellFeed getCellFeedForUpdate(int minRow, int maxRow, int minCol, int maxCol) {
+ CellQuery cellQuery;
+ try {
+ cellQuery = new CellQuery(findWorksheet().getCellFeedUrl());
+ cellQuery.setMinimumCol(minCol);
+ cellQuery.setMaximumCol(maxCol);
+ cellQuery.setMinimumRow(minRow);
+ cellQuery.setMaximumRow(maxRow);
+ cellQuery.setReturnEmpty(true);
+ return service.query(cellQuery, CellFeed.class);
+ } catch (ServiceException e) {
+ throw new RuntimeException("Service error when getting data to edit", e);
+ } catch (IOException e) {
+ throw new RuntimeException("Connection with server broken", e);
+ }
+ }
+
+ private WorksheetEntry findWorksheet() throws IOException, ServiceException {
+ // Spreadsheet KEY is an unique identifier of a spreadsheet document.
+ // The KEY is part of spreadsheet document URL. To find it, just open the
+ // spreadsheet document in your browser and take the 'key' param value.
+ // For example:
+ // URL=https://docs.google.com/spreadsheet/ccc?key=0AuhY-asdcrtr123bc#gid=1
+ // => KEY=0AuhY-asdcrtr123bc
+ // (the real keys are usually much longer)
+ //
+ // Other approach to find spreadsheetKey could be to list all spreadsheets
+ // documents that belong the user and the select one by name. It would require
+ // more code and in particular one more call to API. Then it would stop working
+ // as soon as you name another spreadsheet documents with the same name.
+ // Thus, I think it is not worth the effort.
+ //
+ String spreadsheetKey = "0AuhY-asdcrtr123bc";
+
+ // Worksheet name is the name of a sheet inside the spreadsheet document.
+ // It is a name given by the user as seen in the spreadsheet. In particular
+ // it does not have to be unique, but this is the simplest way I found to
+ // identify a sheet.
+ // Note that this work only if your worksheet has unique name (within
+ // the spreadsheet document, not globally).
+ //
+ // Other approach to find a worksheet is to use worksheet position (1,2, ...)
+ // but I find it less convenient.
+ //
+ String worksheetName = "sheet1";
+
+ SpreadsheetFeed feed = service.getFeed(
+ urlFactory.getSpreadsheetsFeedUrl(),
+ SpreadsheetFeed.class);
+ for (SpreadsheetEntry se : feed.getEntries()) {
+ if (se.getSpreadsheetLink().getHref().endsWith(spreadsheetKey)) {
+ for (WorksheetEntry we : se.getWorksheets()) {
+ if (we.getTitle().getPlainText().equalsIgnoreCase(worksheetName)) {
+ return we;
+ }
+ }
+ }
+ }
+ throw new RuntimeException("Cannot find worksheet=" + worksheetName);
+ }
+
+ /** Adds more rows to the sheet if it is too short. */
+ private void extendSheetIfTooShort(int minRows) {
+ try {
+ WorksheetEntry ws = findWorksheet();
+ if (ws.getRowCount() < minRows) {
+ ws.setRowCount(minRows);
+ ws.getRowCount();
+ ws.update();
+ }
+ } catch (ServiceException e) {
+ throw new RuntimeException("Service error when extending worksheet", e);
+ } catch (IOException e) {
+ throw new RuntimeException("Connection error when extending worksheet", e);
+ }
+ }
+
+ /** Updates cell value. */
+ private void updateCell(CellEntry entry, String newValue) {
+ entry.changeInputValueLocal(newValue);
+ try {
+ // Commit changes - send changes to Google spreadsheet API
+ entry.update();
+ } catch (ServiceException e) {
+ throw new RuntimeException("Service error when updating data", e);
+ } catch (IOException e) {
+ throw new RuntimeException("Connection error when updating data", e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/appengine/mailgun/README.md b/appengine/mailgun/README.md
deleted file mode 100644
index 582771ddb34..00000000000
--- a/appengine/mailgun/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Java Mailgun Email Sample for Google App Engine Standard Environment
-
-This sample demonstrates how to use [Mailgun][mailgun-api] on [Google App Engine
-standard environment][ae-docs].
-
-See the [sample application documentaion][sample-docs] for more detailed
-instructions.
-
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-[mailgun-api]: https://documentation.mailgun.com/
-[sample-docs]: https://cloud.google.com/appengine/docs/java/mail/mailgun
diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml
deleted file mode 100644
index 0e9066ad68c..00000000000
--- a/appengine/mailgun/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-mailgun
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- javax.servlet
- servlet-api
- 2.5
- jar
- provided
-
-
-
- com.sun.jersey
- jersey-core
- 1.19.1
-
-
- com.sun.jersey
- jersey-client
- 1.19.1
-
-
- com.sun.jersey.contribs
- jersey-multipart
- 1.19.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java b/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
deleted file mode 100644
index 899d983a0b0..00000000000
--- a/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.appengine.mailgun;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-
-// [START example]
-@SuppressWarnings("serial")
-public class MailgunServlet extends HttpServlet {
-
- private static final String MAILGUN_DOMAIN_NAME = System.getenv("MAILGUN_DOMAIN_NAME");
- private static final String MAILGUN_API_KEY = System.getenv("MAILGUN_API_KEY");
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- String type = req.getParameter("submit");
- String recipient = req.getParameter("to");
- ClientResponse clientResponse;
- if (type.equals("Send simple email")) {
- clientResponse = sendSimpleMessage(recipient);
- } else {
- clientResponse = sendComplexMessage(recipient);
- }
- if (clientResponse.getStatus() == 200) {
- resp.getWriter().print("Email sent.");
- }
- }
-
- // [START simple]
- private ClientResponse sendSimpleMessage(String recipient) {
- Client client = Client.create();
- client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
- WebResource webResource = client.resource("https://api.mailgun.net/v3/" + MAILGUN_DOMAIN_NAME
- + "/messages");
- MultivaluedMapImpl formData = new MultivaluedMapImpl();
- formData.add("from", "Mailgun User ");
- formData.add("to", recipient);
- formData.add("subject", "Simple Mailgun Example");
- formData.add("text", "Plaintext content");
- return webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
- formData);
- }
- // [END simple]
-
- // [START complex]
- private ClientResponse sendComplexMessage(String recipient) {
- Client client = Client.create();
- client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
- WebResource webResource = client.resource("https://api.mailgun.net/v3/" + MAILGUN_DOMAIN_NAME
- + "/messages");
- FormDataMultiPart formData = new FormDataMultiPart();
- formData.field("from", "Mailgun User ");
- formData.field("to", recipient);
- formData.field("subject", "Complex Mailgun Example");
- formData.field("html", "HTML content");
- ClassLoader classLoader = getClass().getClassLoader();
- File txtFile = new File(classLoader.getResource("example-attachment.txt").getFile());
- formData.bodyPart(new FileDataBodyPart("attachment", txtFile, MediaType.TEXT_PLAIN_TYPE));
- return webResource.type(MediaType.MULTIPART_FORM_DATA_TYPE)
- .post(ClientResponse.class, formData);
- }
- // [END complex]
-}
-// [END example]
diff --git a/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index f720d147b74..00000000000
--- a/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
-
-
-
-
-
diff --git a/appengine/mailgun/src/main/webapp/WEB-INF/web.xml b/appengine/mailgun/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 26e63250cbe..00000000000
--- a/appengine/mailgun/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
- mailgun
- com.example.appengine.mailgun.MailgunServlet
-
-
- mailgun
- /send/email
-
-
-
diff --git a/appengine/mailgun/src/main/webapp/index.html b/appengine/mailgun/src/main/webapp/index.html
deleted file mode 100644
index 6049c6945e7..00000000000
--- a/appengine/mailgun/src/main/webapp/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- Mailgun on Google App Engine Managed VMs
-
-
-
-
-
-
-
diff --git a/appengine/mailjet/README.md b/appengine/mailjet/README.md
deleted file mode 100644
index 0a9bddaaac7..00000000000
--- a/appengine/mailjet/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mailjet sample for Google App Engine
-This sample demonstrates how to use [Mailjet](https://www.mailjet.com/) on Google Managed VMs to
-send emails from a verified sender you own.
-
-## Setup
-1. Before using, ensure the address you plan to send from has been verified in Mailjet.
-
-## Running locally
- $ export MAILJET_API_KEY=[your mailjet api key]
- $ export MAILJET_SECRET_KEY=[your mailjet secret key]
- $ mvn clean appengine:devserver
-
-## Deploying
-1. Edit the environment variables in the appengine-web.xml with the appropriate Mailjet values.
- $ mvn clean appengine:update
diff --git a/appengine/mailjet/pom.xml b/appengine/mailjet/pom.xml
deleted file mode 100644
index 2b47778132d..00000000000
--- a/appengine/mailjet/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-mailjet
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- com.mailjet
- mailjet-client
- 4.0.4
- system
- ${project.basedir}/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
-
-
- javax.servlet
- servlet-api
- 2.5
- jar
- provided
-
-
-
- com.sun.jersey
- jersey-core
- 1.19.1
-
-
- com.sun.jersey
- jersey-client
- 1.19.1
-
-
- com.sun.jersey.contribs
- jersey-multipart
- 1.19.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java b/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
deleted file mode 100644
index a63e44073ab..00000000000
--- a/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-// [START mailjet_imports]
-package com.example.appengine.mailjet;
-
-import com.mailjet.client.MailjetClient;
-import com.mailjet.client.MailjetRequest;
-import com.mailjet.client.MailjetResponse;
-import com.mailjet.client.errors.MailjetException;
-import com.mailjet.client.resource.Email;
-// [END mailjet_imports]
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START app]
-@SuppressWarnings("serial")
-public class MailjetServlet extends HttpServlet {
- private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
- private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
- private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY);
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String recipient = req.getParameter("to");
- String sender = req.getParameter("from");
-
- MailjetRequest email = new MailjetRequest(Email.resource)
- .property(Email.FROMEMAIL, sender)
- .property(Email.FROMNAME, "pandora")
- .property(Email.SUBJECT, "Your email flight plan!")
- .property(Email.TEXTPART,
- "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
- .property(Email.HTMLPART,
- "
Dear passenger, welcome to Mailjet!
May the delivery force be with you!")
- .property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
-
- try {
- // trigger the API call
- MailjetResponse response = client.post(email);
- // Read the response data and status
- resp.getWriter().print(response.getStatus());
- resp.getWriter().print(response.getData());
- } catch (MailjetException e) {
- throw new ServletException("Mailjet Exception", e);
- }
- }
-}
-// [END app]
diff --git a/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 653950db1c9..00000000000
--- a/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-// [START env_variables]
-
-
-
-
-// [END env_variables]
-
diff --git a/appengine/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar b/appengine/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
deleted file mode 100644
index e3b58094cf6..00000000000
Binary files a/appengine/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar and /dev/null differ
diff --git a/appengine/mailjet/src/main/webapp/WEB-INF/web.xml b/appengine/mailjet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e0d543ad029..00000000000
--- a/appengine/mailjet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- mailjet
- com.example.appengine.mailjet.MailjetServlet
-
-
- mailjet
- /send/email
-
-
diff --git a/appengine/mailjet/src/main/webapp/index.html b/appengine/mailjet/src/main/webapp/index.html
deleted file mode 100644
index 037fddcea91..00000000000
--- a/appengine/mailjet/src/main/webapp/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- Mailgun on Google App Engine Managed VMs
-
-
-
-
-
-
-
diff --git a/appengine/memcache/pom.xml b/appengine/memcache/pom.xml
deleted file mode 100644
index d42990edbbf..00000000000
--- a/appengine/memcache/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-memcache
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- servlet-api
- 2.5
- jar
- provided
-
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
-
-
- com.googlecode.xmemcached
- xmemcached
- 2.0.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.7
- 1.7
-
-
-
-
-
diff --git a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
deleted file mode 100644
index 802777e8481..00000000000
--- a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.memcache;
-
-import com.google.appengine.api.memcache.AsyncMemcacheService;
-import com.google.appengine.api.memcache.ErrorHandlers;
-import com.google.appengine.api.memcache.MemcacheServiceFactory;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@SuppressWarnings("serial")
-public class MemcacheAsyncCacheServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String path = req.getRequestURI();
- if (path.startsWith("/favicon.ico")) {
- return; // ignore the request for favicon.ico
- }
-
- // [START example]
- AsyncMemcacheService asyncCache = MemcacheServiceFactory.getAsyncMemcacheService();
- asyncCache.setErrorHandler(ErrorHandlers.getConsistentLogAndContinue(Level.INFO));
- String key = "count-async";
- byte[] value;
- long count = 1;
- Future
-
-
-
-
-
-
\ No newline at end of file
diff --git a/appengine/users/README.md b/appengine/users/README.md
deleted file mode 100644
index 4d6d60a6a02..00000000000
--- a/appengine/users/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Users Authentication sample for Google App Engine
-
-This sample demonstrates how to use the [Users API][appid] on [Google App
-Engine][ae-docs].
-
-[appid]: https://cloud.google.com/appengine/docs/java/users/
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-## Running locally
-This example uses the
-[Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
-To run this sample locally:
-
- $ mvn appengine:devserver
-
-## Deploying
-In the following command, replace YOUR-PROJECT-ID with your
-[Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber).
-
- $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
-
-## Setup
-To save your project settings so that you don't need to enter the
- parameters, you can:
-
-1. Update the tag in src/main/webapp/WEB-INF/appengine-web.xml
- with your project name.
-
-2. Update the tag in src/main/webapp/WEB-INF/appengine-web.xml
- with a valid version number.
-
-
-You will now be able to run
-
- $ mvn appengine:update
-
-without the need for any additional parameters.
diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml
deleted file mode 100644
index 94aec92ab3d..00000000000
--- a/appengine/users/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-users
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
- com.google.guava
- guava
- 19.0
-
-
- javax.servlet
- servlet-api
- 2.5
- jar
- provided
-
-
- org.json
- json
- 20160810
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- com.google.appengine
- appengine-testing
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-api-stubs
- ${appengine.sdk.version}
- test
-
-
- com.google.appengine
- appengine-tools-sdk
- ${appengine.sdk.version}
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java b/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
deleted file mode 100644
index cd976a1820c..00000000000
--- a/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-// [START users_API_example]
-package com.example.appengine.users;
-
-import com.google.appengine.api.users.UserService;
-import com.google.appengine.api.users.UserServiceFactory;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class UsersServlet extends HttpServlet {
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws IOException {
- UserService userService = UserServiceFactory.getUserService();
-
- String thisUrl = req.getRequestURI();
-
- resp.setContentType("text/html");
- if (req.getUserPrincipal() != null) {
- resp.getWriter().println("
Hello, "
- + req.getUserPrincipal().getName()
- + "! You can sign out.
");
- }
- }
-}
-// [END users_API_example]
-
diff --git a/appengine/users/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index c9e245399bf..00000000000
--- a/appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
diff --git a/appengine/users/src/main/webapp/WEB-INF/web.xml b/appengine/users/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4b2b77234dc..00000000000
--- a/appengine/users/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- users
- com.example.appengine.users.UsersServlet
-
-
- users
- /
-
-
diff --git a/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java b/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
deleted file mode 100644
index b710ae737d0..00000000000
--- a/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.appengine.users;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.management.remote.JMXPrincipal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Unit tests for {@link UsersServlet}.
- */
-@RunWith(JUnit4.class)
-public class UsersServletTest {
- private static final String FAKE_URL = "fakey.fake.fak";
- private static final String FAKE_NAME = "Fake";
- // Set up a helper so that the ApiProxy returns a valid environment for local testing.
- private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
-
- @Mock private HttpServletRequest mockRequestNotLoggedIn;
- @Mock private HttpServletRequest mockRequestLoggedIn;
- @Mock private HttpServletResponse mockResponse;
- private StringWriter responseWriter;
- private UsersServlet servletUnderTest;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- helper.setUp();
-
- // Set up some fake HTTP requests
- // If the user isn't logged in, use this request
- when(mockRequestNotLoggedIn.getRequestURI()).thenReturn(FAKE_URL);
- when(mockRequestNotLoggedIn.getUserPrincipal()).thenReturn(null);
-
- // If the user is logged in, use this request
- when(mockRequestLoggedIn.getRequestURI()).thenReturn(FAKE_URL);
- // Most of the classes that implement Principal have been
- // deprecated. JMXPrincipal seems like a safe choice.
- when(mockRequestLoggedIn.getUserPrincipal()).thenReturn(new JMXPrincipal(FAKE_NAME));
-
- // Set up a fake HTTP response.
- responseWriter = new StringWriter();
- when(mockResponse.getWriter()).thenReturn(new PrintWriter(responseWriter));
-
- servletUnderTest = new UsersServlet();
- }
-
- @After public void tearDown() {
- helper.tearDown();
- }
-
- @Test
- public void doGet_userNotLoggedIn_writesResponse() throws Exception {
- servletUnderTest.doGet(mockRequestNotLoggedIn, mockResponse);
-
- // If a user isn't logged in, we expect a prompt
- // to login to be returned.
- assertThat(responseWriter.toString())
- .named("UsersServlet response")
- .contains("
");
- }
-
- @Test
- public void doGet_userLoggedIn_writesResponse() throws Exception {
- servletUnderTest.doGet(mockRequestLoggedIn, mockResponse);
-
- // If a user is logged in, we expect a prompt
- // to logout to be returned.
- assertThat(responseWriter.toString())
- .named("UsersServlet response")
- .contains("
Hello, " + FAKE_NAME + "!");
- assertThat(responseWriter.toString())
- .named("UsersServlet response")
- .contains("sign out");
- }
-}
diff --git a/appengine/xmpp/README.md b/appengine/xmpp/README.md
deleted file mode 100644
index 7ca936b5f0c..00000000000
--- a/appengine/xmpp/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Google App Engine Standard Environment XMPP Java API Overview
-
-This sample demonstrates how to use XMPP Java API on Google App Engine.
-
-See the [Google App Engine standard environment documentation][ae-docs] for more
-detailed instructions.
-
-[ae-docs]: https://cloud.google.com/appengine/docs/java/
-
-## Setup
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your project name.
-1. Update the `` tag in `src/main/webapp/WEB-INF/appengine-web.xml`
- with your version name.
-
-## Running locally
- $ mvn appengine:devserver
-
-## Deploying
- $ mvn appengine:update
diff --git a/appengine/xmpp/pom.xml b/appengine/xmpp/pom.xml
deleted file mode 100644
index c7c90b8fce8..00000000000
--- a/appengine/xmpp/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.appengine
- appengine-xmpp
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
- javax.servlet
- servlet-api
- jar
- provided
-
-
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
-
-
-
-
- com.google.guava
- guava
- 19.0
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
-
- com.google.appengine
- appengine-maven-plugin
- ${appengine.sdk.version}
-
-
-
-
diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java
deleted file mode 100644
index 20a6779207c..00000000000
--- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.xmpp;
-
-import com.google.common.io.ByteStreams;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class ErrorServlet extends HttpServlet {
- private static final Logger log = Logger.getLogger(ErrorServlet.class.getName());
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
- // Parse the POST data, which is sent as a MIME stream containing the stanza.
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ServletInputStream inputStream = req.getInputStream();
- ByteStreams.copy(inputStream, baos);
-
- // Log the error
- log.warning("Error stanza received: " + baos.toString());
- }
-}
-// [END example]
diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java
deleted file mode 100644
index d43754048a2..00000000000
--- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.xmpp;
-
-import com.google.appengine.api.xmpp.JID;
-import com.google.appengine.api.xmpp.Message;
-import com.google.appengine.api.xmpp.XMPPService;
-import com.google.appengine.api.xmpp.XMPPServiceFactory;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class MessageReceiverServlet extends HttpServlet {
- private static final Logger log = Logger.getLogger(MessageReceiverServlet.class.getName());
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
-
- XMPPService xmpp = XMPPServiceFactory.getXMPPService();
- Message message = xmpp.parseMessage(req);
-
- JID fromJid = message.getFromJid();
- String body = message.getBody();
-
- log.info("Received a message with id: " + fromJid + " and body: " + body);
- // ...
- }
-}
-// [END example]
diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java
deleted file mode 100644
index 05461091698..00000000000
--- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.xmpp;
-
-import com.google.appengine.api.xmpp.JID;
-import com.google.appengine.api.xmpp.Message;
-import com.google.appengine.api.xmpp.MessageBuilder;
-import com.google.appengine.api.xmpp.SendResponse;
-import com.google.appengine.api.xmpp.XMPPService;
-import com.google.appengine.api.xmpp.XMPPServiceFactory;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class MessageSenderServlet extends HttpServlet {
- private static final Logger log = Logger.getLogger(MessageSenderServlet.class.getName());
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
-
- JID jid = new JID("example@gmail.com");
- String msgBody = "Someone has sent you a gift on Example.com. To view: http://example.com/gifts/";
- Message msg =
- new MessageBuilder()
- .withRecipientJids(jid)
- .withBody(msgBody)
- .build();
-
- boolean messageSent = false;
- XMPPService xmpp = XMPPServiceFactory.getXMPPService();
- SendResponse status = xmpp.sendMessage(msg);
- messageSent = (status.getStatusMap().get(jid) == SendResponse.Status.SUCCESS);
-
- log.info("Message sent? " + messageSent);
-
- if (!messageSent) {
- // Send an email message instead...
- }
- }
-}
-// [END example]
diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java
deleted file mode 100644
index 1af7e0bea5a..00000000000
--- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.xmpp;
-
-import com.google.appengine.api.xmpp.Presence;
-import com.google.appengine.api.xmpp.PresenceType;
-import com.google.appengine.api.xmpp.XMPPService;
-import com.google.appengine.api.xmpp.XMPPServiceFactory;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class PresenceServlet extends HttpServlet {
- private static final Logger log = Logger.getLogger(PresenceServlet.class.getName());
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
-
- XMPPService xmpp = XMPPServiceFactory.getXMPPService();
- Presence presence = xmpp.parsePresence(req);
-
- // Split the XMPP address (e.g., user@gmail.com)
- // from the resource (e.g., gmail.CD6EBC4A)
- String from = presence.getFromJid().getId().split("/")[0];
-
- log.info("Received presence from: " + from);
-
- // Mirror the contact's presence back to them
- xmpp.sendPresence(
- presence.getFromJid(),
- PresenceType.AVAILABLE,
- presence.getPresenceShow(),
- presence.getStatus());
- }
-}
-// [END example]
diff --git a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java b/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java
deleted file mode 100644
index e330006109f..00000000000
--- a/appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.appengine.xmpp;
-
-import com.google.appengine.api.xmpp.Subscription;
-import com.google.appengine.api.xmpp.XMPPService;
-import com.google.appengine.api.xmpp.XMPPServiceFactory;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-public class SubscriptionServlet extends HttpServlet {
- private static final Logger log = Logger.getLogger(SubscriptionServlet.class.getName());
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
- XMPPService xmppService = XMPPServiceFactory.getXMPPService();
- Subscription sub = xmppService.parseSubscription(req);
-
- // Split the bare XMPP address (e.g., user@gmail.com)
- // from the resource (e.g., gmail.CD6EBC4A)
- String from = sub.getFromJid().getId().split("/")[0];
-
- log.info("Received subscription event from: " + from);
- }
-}
-// [END example]
diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index efe638217ee..00000000000
--- a/appengine/xmpp/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- YOUR-PROJECT-ID
- YOUR-VERSION-ID
- true
-
-
-
- xmpp_message
- xmpp_presence
- xmpp_subscribe
- xmpp_error
-
-
-
-
diff --git a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml b/appengine/xmpp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 5bbb66f21c2..00000000000
--- a/appengine/xmpp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
- error
- com.example.appengine.xmpp.ErrorServlet
-
-
- error
- /_ah/xmpp/error/
-
-
-
- messagereceiver
- com.example.appengine.xmpp.MessageReceiverServlet
-
-
- messagereceiver
- /_ah/xmpp/message/chat/
-
-
-
- messagesender
- com.example.appengine.xmpp.MessageSenderServlet
-
-
- messagesender
- /messagesender
-
-
- presence
- com.example.appengine.xmpp.PresenceServlet
-
-
- presence
- /_ah/xmpp/presence/available/
- /_ah/xmpp/presence/unavailable/
- /_ah/xmpp/presence/probe/
-
-
- subscription
- com.example.appengine.xmpp.SubscriptionServlet
-
-
- subscription
- /_ah/xmpp/subscription/subscribe/
- /_ah/xmpp/subscription/subscribed/
- /_ah/xmpp/subscription/unsubscribe/
- /_ah/xmpp/subscription/unsubscribed/
-
-
diff --git a/bigquery/README.md b/bigquery/README.md
deleted file mode 100644
index fc6ec28c77c..00000000000
--- a/bigquery/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Getting Started with BigQuery and the Google Java API Client library
-
-Google's BigQuery Service features a REST-based API that allows developers to create applications to run ad-hoc queries on massive datasets. These sample Java applications demonstrate how to access the BigQuery API using the Google Java API Client Libraries. For more information, read the [Getting Started with BigQuery and the Google Java API Client library][1] codelab.
-
-## Quickstart
-
-Install [Maven](http://maven.apache.org/).
-
-Build your project with:
-
- mvn package
-
-You can then run a given `ClassName` via:
-
- mvn exec:java -Dexec.mainClass=com.google.cloud.bigquery.samples.ClassName \
- -Dexec.args="any arguments to the app"
-
-## Products
-- [Google BigQuery][2]
-
-## Language
-- [Java][3]
-
-## Dependencies
-- [Google APIs Client Library for Java][4]
-
-[1]: https://cloud.google.com/bigquery/bigquery-api-quickstart
-[2]: https://developers.google.com/bigquery
-[3]: https://java.com
-[4]: http://code.google.com/p/google-api-java-client/
-
diff --git a/bigquery/pom.xml b/bigquery/pom.xml
deleted file mode 100644
index 1859b420b4b..00000000000
--- a/bigquery/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
- 4.0.0
- com.google.cloud.bigquery.samples
- bigquery-samples
- jar
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ..
-
-
-
-
- googleapis
- https://google-api-client-libraries.appspot.com/mavenrepo
-
-
-
-
-
- com.google.apis
- google-api-services-bigquery
- v2-rev316-1.22.0
-
-
- com.google.oauth-client
- google-oauth-client
- ${project.oauth.version}
-
-
- com.google.http-client
- google-http-client-jackson2
- ${project.http.version}
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- ${project.oauth.version}
-
-
- com.google.code.gson
- gson
- 2.7
-
-
- junit
- junit
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
- 1.21.0
- 1.21.0
- UTF-8
-
-
-
- src/main/java
-
-
- src/main/resources
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.2
-
- 5
- 5
-
-
-
-
-
-
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/AsyncQuerySample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/AsyncQuerySample.java
deleted file mode 100644
index a76b9e03c51..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/AsyncQuerySample.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) 2015 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.google.cloud.bigquery.samples;
-
-
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.Bigquery.Jobs.GetQueryResults;
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationQuery;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Scanner;
-
-
-/**
- * Example of authorizing with BigQuery and reading from a public dataset.
- */
-public class AsyncQuerySample extends BigqueryUtils {
- // [START main]
- /**
- * Prompts for all the parameters required to make a query.
- *
- * @param args Command line args
- * @throws IOException IOException
- * @throws InterruptedException InterruptedException
- */
- public static void main(final String[] args)
- throws IOException, InterruptedException {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Enter your project id: ");
- String projectId = scanner.nextLine();
- System.out.println("Enter your query string: ");
- String queryString = scanner.nextLine();
- System.out.println("Run query in batch mode? [true|false] ");
- boolean batch = Boolean.valueOf(scanner.nextLine());
- System.out.println("Enter how often to check if your job is complete "
- + "(milliseconds): ");
- long waitTime = scanner.nextLong();
- scanner.close();
- Iterator pages = run(projectId, queryString,
- batch, waitTime);
- while (pages.hasNext()) {
- printRows(pages.next().getRows(), System.out);
- }
- }
- // [END main]
-
- // [START run]
- /**
- * Run the query.
- *
- * @param projectId Get this from Google Developers console
- * @param queryString Query we want to run against BigQuery
- * @param batch True if you want to batch the queries
- * @param waitTime How long to wait before retries
- * @return An interator to the result of your pages
- * @throws IOException Thrown if there's an IOException
- * @throws InterruptedException Thrown if there's an Interrupted Exception
- */
- public static Iterator run(final String projectId,
- final String queryString,
- final boolean batch,
- final long waitTime)
- throws IOException, InterruptedException {
-
- Bigquery bigquery = BigqueryServiceFactory.getService();
-
- Job query = asyncQuery(bigquery, projectId, queryString, batch);
- Bigquery.Jobs.Get getRequest = bigquery.jobs().get(
- projectId, query.getJobReference().getJobId());
-
- //Poll every waitTime milliseconds,
- //retrying at most retries times if there are errors
- pollJob(getRequest, waitTime);
-
- GetQueryResults resultsRequest = bigquery.jobs().getQueryResults(
- projectId, query.getJobReference().getJobId());
-
- return getPages(resultsRequest);
- }
- // [END run]
-
- // [START asyncQuery]
- /**
- * Inserts an asynchronous query Job for a particular query.
- *
- * @param bigquery an authorized BigQuery client
- * @param projectId a String containing the project ID
- * @param querySql the actual query string
- * @param batch True if you want to run the query as BATCH
- * @return a reference to the inserted query job
- * @throws IOException Thrown if there's a network exception
- */
- public static Job asyncQuery(final Bigquery bigquery,
- final String projectId,
- final String querySql,
- final boolean batch) throws IOException {
-
- JobConfigurationQuery queryConfig = new JobConfigurationQuery()
- .setQuery(querySql);
-
- if (batch) {
- queryConfig.setPriority("BATCH");
- }
-
- Job job = new Job().setConfiguration(
- new JobConfiguration().setQuery(queryConfig));
-
- return bigquery.jobs().insert(projectId, job).execute();
- }
- // [END asyncQuery]
-
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryServiceFactory.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryServiceFactory.java
deleted file mode 100644
index a9037ef4bd5..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryServiceFactory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples;
-
-// [START imports]
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.BigqueryScopes;
-// [END imports]
-
-import java.io.IOException;
-import java.util.Collection;
-
-/**
- * This class creates our Service to connect to Bigquery including auth.
- */
-public final class BigqueryServiceFactory {
-
- /**
- * Private constructor to disable creation of this utility Factory class.
- */
- private BigqueryServiceFactory() {
-
- }
-
- /**
- * Singleton service used through the app.
- */
- private static Bigquery service = null;
-
- /**
- * Mutex created to create the singleton in thread-safe fashion.
- */
- private static Object serviceLock = new Object();
-
- /**
- * Threadsafe Factory that provides an authorized Bigquery service.
- * @return The Bigquery service
- * @throws IOException Thronw if there is an error connecting to Bigquery.
- */
- public static Bigquery getService() throws IOException {
- if (service == null) {
- synchronized (serviceLock) {
- if (service == null) {
- service = createAuthorizedClient();
- }
- }
- }
- return service;
- }
-
- /**
- * Creates an authorized client to Google Bigquery.
- *
- * @return The BigQuery Service
- * @throws IOException Thrown if there is an error connecting
- */
- // [START get_service]
- private static Bigquery createAuthorizedClient() throws IOException {
- // Create the credential
- HttpTransport transport = new NetHttpTransport();
- JsonFactory jsonFactory = new JacksonFactory();
- GoogleCredential credential = GoogleCredential.getApplicationDefault(transport, jsonFactory);
-
- // Depending on the environment that provides the default credentials (e.g. Compute Engine, App
- // Engine), the credentials may require us to specify the scopes we need explicitly.
- // Check for this case, and inject the Bigquery scope if required.
- if (credential.createScopedRequired()) {
- Collection bigqueryScopes = BigqueryScopes.all();
- credential = credential.createScoped(bigqueryScopes);
- }
-
- return new Bigquery.Builder(transport, jsonFactory, credential)
- .setApplicationName("BigQuery Samples").build();
- }
- // [END get_service]
-
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryUtils.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryUtils.java
deleted file mode 100644
index 743c29eac79..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryUtils.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- Copyright 2015, 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.google.cloud.bigquery.samples;
-
-import com.google.api.client.json.GenericJson;
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.Bigquery.Datasets;
-import com.google.api.services.bigquery.BigqueryRequest;
-import com.google.api.services.bigquery.model.DatasetList;
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.TableCell;
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-import com.google.gson.Gson;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * Helper functions for the other classes.
- */
-public class BigqueryUtils {
-
- /**
- * Private contructor to prevent creation of this class, which is just all
- * static helper methods.
- */
- protected BigqueryUtils() {
- }
-
- /**
- * Print rows to the output stream in a formatted way.
- * @param rows rows in bigquery
- * @param out Output stream we want to print to
- */
- // [START print_rows]
- public static void printRows(final List rows, final PrintStream out) {
- for (TableRow row : rows) {
- for (TableCell field : row.getF()) {
- out.printf("%-50s", field.getV());
- }
- out.println();
- }
- }
- // [END print_rows]
-
- /**
- * Polls the job for completion.
- * @param request The bigquery request to poll for completion
- * @param interval Number of milliseconds between each poll
- * @return The finished job
- * @throws IOException IOException
- * @throws InterruptedException InterruptedException
- */
- // [START poll_job]
- public static Job pollJob(final Bigquery.Jobs.Get request, final long interval)
- throws IOException, InterruptedException {
- Job job = request.execute();
- while (!job.getStatus().getState().equals("DONE")) {
- System.out.println("Job is "
- + job.getStatus().getState()
- + " waiting " + interval + " milliseconds...");
- Thread.sleep(interval);
- job = request.execute();
- }
- return job;
- }
- // [END poll_job]
-
- /**
- * Pages through the results of an arbitrary Bigquery request.
- * @param requestTemplate The object that represents the call to fetch
- * the results.
- * @param The type of the returned objects
- * @return An iterator that pages through the returned object
- */
- // [START paging]
- public static Iterator getPages(
- final BigqueryRequest requestTemplate) {
-
- /**
- * An iterator class that pages through a Bigquery request.
- */
- class PageIterator implements Iterator {
-
- private BigqueryRequest request;
- private boolean hasNext = true;
-
- /**
- * Inner class that represents our iterator to page through results.
- * @param requestTemplate The object that represents the call to fetch
- * the results.
- */
- public PageIterator(final BigqueryRequest requestTemplate) {
- this.request = requestTemplate;
- }
-
- /**
- * Checks whether there is another page of results.
- * @return True if there is another page of results.
- */
- public boolean hasNext() {
- return hasNext;
- }
-
- /**
- * Returns the next page of results.
- * @return The next page of resul.ts
- */
- public T next() {
- if (!hasNext) {
- throw new NoSuchElementException();
- }
- try {
- T response = request.execute();
- if (response.containsKey("pageToken")) {
- request = request.set("pageToken", response.get("pageToken"));
- } else {
- hasNext = false;
- }
- return response;
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- /**
- * Skips the page by moving the iterator to the next page.
- */
- public void remove() {
- this.next();
- }
- }
-
- return new PageIterator(requestTemplate);
- }
- // [END paging]
-
- /**
- * Loads a Bigquery schema.
- * @param schemaSource The source of the schema
- * @return The TableSchema
- */
- // [START load_schema]
- public static TableSchema loadSchema(final Reader schemaSource) {
- TableSchema sourceSchema = new TableSchema();
-
- List fields = (new Gson())
- .>fromJson(schemaSource,
- (new ArrayList()).getClass());
-
- sourceSchema.setFields(fields);
-
- return sourceSchema;
- }
- // [END load_schema]
-
- // [START list_datasets]
- /**
- * Display all BigQuery datasets associated with a project.
- *
- * @param bigquery an authorized BigQuery client
- * @param projectId a string containing the current project ID
- * @throws IOException Thrown if there is a network error connecting to
- * Bigquery.
- */
- public static void listDatasets(final Bigquery bigquery, final String projectId)
- throws IOException {
- Datasets.List datasetRequest = bigquery.datasets().list(projectId);
- DatasetList datasetList = datasetRequest.execute();
- if (datasetList.getDatasets() != null) {
- List datasets = datasetList.getDatasets();
- System.out.println("Available datasets\n----------------");
- System.out.println(datasets.toString());
- for (DatasetList.Datasets dataset : datasets) {
- System.out.format("%s\n", dataset.getDatasetReference().getDatasetId());
- }
- }
- }
- // [END list_datasets]
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/ExportDataCloudStorageSample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/ExportDataCloudStorageSample.java
deleted file mode 100644
index 736e5c31bbb..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/ExportDataCloudStorageSample.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- Copyright 2015, 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.google.cloud.bigquery.samples;
-
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationExtract;
-import com.google.api.services.bigquery.model.TableReference;
-
-import java.io.IOException;
-import java.util.Scanner;
-
-/**
- * Sample of how to Export Cloud Data.
- */
-public class ExportDataCloudStorageSample {
- /**
- * Protected constructor since this is a collection of static functions.
- */
- protected ExportDataCloudStorageSample() {
- super();
- }
-
- /**
- * This program can be run to demonstrate running a Bigquery query from the
- * CLI.
- * @param args Command line args
- * @throws IOException If there is an error connceting to bigquery
- * @throws InterruptedException Should never be thrown.
- */
- // [START main]
- public static void main(final String[] args)
- throws IOException, InterruptedException {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Enter your project id: ");
- String projectId = scanner.nextLine();
- System.out.println("Enter your dataset id: ");
- String datasetId = scanner.nextLine();
- System.out.println("Enter your table id: ");
- String tableId = scanner.nextLine();
- System.out.println("Enter the Google Cloud Storage Path to which you'd "
- + "like to export: ");
- String cloudStoragePath = scanner.nextLine();
- System.out.println("Enter how often to check if your job is complete "
- + "(milliseconds): ");
- long interval = scanner.nextLong();
- scanner.close();
-
- run(cloudStoragePath, projectId, datasetId, tableId, interval);
- }
- // [END main]
-
- /**
- * Run the bigquery ClI.
- * @param cloudStoragePath The bucket we are using
- * @param projectId Project id
- * @param datasetId datasetid
- * @param tableId tableid
- * @param interval interval to wait between polling in milliseconds
- * @throws IOException Thrown if there is an error connecting to Bigquery.
- * @throws InterruptedException Should never be thrown
- */
- // [START run]
- public static void run(
- final String cloudStoragePath,
- final String projectId,
- final String datasetId,
- final String tableId,
- final long interval) throws IOException, InterruptedException {
-
- Bigquery bigquery = BigqueryServiceFactory.getService();
-
- Job extractJob = extractJob(
- bigquery,
- cloudStoragePath,
- new TableReference()
- .setProjectId(projectId)
- .setDatasetId(datasetId)
- .setTableId(tableId));
-
- Bigquery.Jobs.Get getJob = bigquery.jobs().get(
- extractJob.getJobReference().getProjectId(),
- extractJob.getJobReference().getJobId());
-
- BigqueryUtils.pollJob(getJob, interval);
-
- System.out.println("Export is Done!");
-
- }
- // [END run]
-
-
- /**
- * A job that extracts data from a table.
- * @param bigquery Bigquery service to use
- * @param cloudStoragePath Cloud storage bucket we are inserting into
- * @param table Table to extract from
- * @return The job to extract data from the table
- * @throws IOException Thrown if error connceting to Bigtable
- */
- // [START extract_job]
- public static Job extractJob(
- final Bigquery bigquery,
- final String cloudStoragePath,
- final TableReference table) throws IOException {
-
- JobConfigurationExtract extract = new JobConfigurationExtract()
- .setSourceTable(table)
- .setDestinationUri(cloudStoragePath);
-
- return bigquery.jobs().insert(table.getProjectId(),
- new Job().setConfiguration(new JobConfiguration().setExtract(extract)))
- .execute();
- }
- // [END extract_job]
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/GettingStarted.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/GettingStarted.java
deleted file mode 100644
index 8cdb96a6489..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/GettingStarted.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2012 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.google.cloud.bigquery.samples;
-
-// [START all]
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.BigqueryScopes;
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.api.services.bigquery.model.QueryRequest;
-import com.google.api.services.bigquery.model.QueryResponse;
-import com.google.api.services.bigquery.model.TableCell;
-import com.google.api.services.bigquery.model.TableRow;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Scanner;
-
-
-/**
- * Example of authorizing with Bigquery and reading from a public dataset.
- *
- * Specifically, this queries the shakespeare dataset to fetch the 10 of Shakespeare's works with
- * the greatest number of distinct words.
- */
-public class GettingStarted {
- // [START build_service]
- /**
- * Creates an authorized Bigquery client service using Application Default Credentials.
- *
- * @return an authorized Bigquery client
- * @throws IOException if there's an error getting the default credentials.
- */
- public static Bigquery createAuthorizedClient() throws IOException {
- // Create the credential
- HttpTransport transport = new NetHttpTransport();
- JsonFactory jsonFactory = new JacksonFactory();
- GoogleCredential credential = GoogleCredential.getApplicationDefault(transport, jsonFactory);
-
- // Depending on the environment that provides the default credentials (e.g. Compute Engine, App
- // Engine), the credentials may require us to specify the scopes we need explicitly.
- // Check for this case, and inject the Bigquery scope if required.
- if (credential.createScopedRequired()) {
- credential = credential.createScoped(BigqueryScopes.all());
- }
-
- return new Bigquery.Builder(transport, jsonFactory, credential)
- .setApplicationName("Bigquery Samples").build();
- }
- // [END build_service]
-
- // [START run_query]
- /**
- * Executes the given query synchronously.
- *
- * @param querySql the query to execute.
- * @param bigquery the Bigquery service object.
- * @param projectId the id of the project under which to run the query.
- * @return a list of the results of the query.
- * @throws IOException if there's an error communicating with the API.
- */
- private static List executeQuery(String querySql, Bigquery bigquery, String projectId)
- throws IOException {
- QueryResponse query = bigquery.jobs().query(
- projectId,
- new QueryRequest().setQuery(querySql))
- .execute();
-
- // Execute it
- GetQueryResultsResponse queryResult = bigquery.jobs().getQueryResults(
- query.getJobReference().getProjectId(),
- query.getJobReference().getJobId()).execute();
-
- return queryResult.getRows();
- }
- // [END run_query]
-
- // [START print_results]
- /**
- * Prints the results to standard out.
- *
- * @param rows the rows to print.
- */
- private static void printResults(List rows) {
- System.out.print("\nQuery Results:\n------------\n");
- for (TableRow row : rows) {
- for (TableCell field : row.getF()) {
- System.out.printf("%-50s", field.getV());
- }
- System.out.println();
- }
- }
- // [END print_results]
-
- /**
- * Exercises the methods defined in this class.
- *
- * In particular, it creates an authorized Bigquery service object using Application Default
- * Credentials, then executes a query against the public Shakespeare dataset and prints out the
- * results.
- *
- * @param args the first argument, if it exists, should be the id of the project to run the test
- * under. If no arguments are given, it will prompt for it.
- * @throws IOException if there's an error communicating with the API.
- */
- public static void main(String[] args) throws IOException {
- Scanner sc;
- if (args.length == 0) {
- // Prompt the user to enter the id of the project to run the queries under
- System.out.print("Enter the project ID: ");
- sc = new Scanner(System.in);
- } else {
- sc = new Scanner(args[0]);
- }
- String projectId = sc.nextLine();
-
- // Create a new Bigquery client authorized via Application Default Credentials.
- Bigquery bigquery = createAuthorizedClient();
-
- List rows = executeQuery("SELECT TOP(corpus, 10) as title, COUNT(*) as unique_words "
- + "FROM [publicdata:samples.shakespeare]", bigquery, projectId);
-
- printResults(rows);
- }
-
-}
-// [END all]
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/ListDatasetsProjects.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/ListDatasetsProjects.java
deleted file mode 100644
index 854e1b6e6ca..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/ListDatasetsProjects.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples;
-
-import com.google.api.client.util.Data;
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.Bigquery.Datasets;
-import com.google.api.services.bigquery.model.DatasetList;
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.api.services.bigquery.model.ProjectList;
-import com.google.api.services.bigquery.model.QueryRequest;
-import com.google.api.services.bigquery.model.QueryResponse;
-import com.google.api.services.bigquery.model.TableCell;
-import com.google.api.services.bigquery.model.TableRow;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.lang.Thread;
-import java.util.List;
-
-/**
- * Invokes the BigQuery basic APIs for the given project id specified.
- *
- * Samples used in this page:
- *
- * https://cloud.google.com/bigquery/bigquery-api-quickstart
- */
-public class ListDatasetsProjects {
- /**
- * Run the sample.
- */
- public static void main(String[] args) throws IOException, InterruptedException {
- if (args.length != 1) {
- System.err.println("Usage: QuickStart ");
- return;
- }
- String projectId = args[0];
-
- Bigquery bigquery = BigqueryServiceFactory.getService();
- String query = "SELECT TOP( title, 10) as title, COUNT(*) as revision_count "
- + "FROM [publicdata:samples.wikipedia] WHERE wp_namespace = 0;";
-
- System.out.println();
- System.out.println("----- Running the asynchronous query and printing it to stdout.");
- runQueryRpcAndPrint(bigquery, projectId, query, System.out);
-
- System.out.println();
- System.out.println("----- Listing all the Datasets in the projectId");
- listDatasets(bigquery, projectId);
-
- System.out.println();
- System.out.println("----- Listing all the Projects");
- listProjects(bigquery);
- }
-
- /**
- * Lists all Datasets in a project specified by the projectId.
- *
- * @param bigquery The BigQuery object.
- * @param projectId The projectId from which lists the existing Datasets.
- * @throws IOException if there's trouble with the network request.
- */
- // [START listDatasets]
- public static void listDatasets(Bigquery bigquery, String projectId) throws IOException {
- Datasets.List datasetRequest = bigquery.datasets().list(projectId);
- DatasetList datasetList = datasetRequest.execute();
-
- if (datasetList.getDatasets() != null) {
- List datasets = datasetList.getDatasets();
- System.out.println("Dataset list:");
-
- for (DatasetList.Datasets dataset : datasets) {
- System.out.format("%s\n", dataset.getDatasetReference().getDatasetId());
- }
- }
- }
- // [END listDatasets]
-
- /**
- * Lists all Projects.
- *
- * @param bigquery The BigQuery object.
- * @throws IOException if there's trouble with the network request.
- */
- // [START listProjects]
- public static void listProjects(Bigquery bigquery) throws IOException {
- Bigquery.Projects.List projectListRequest = bigquery.projects().list();
- ProjectList projectList = projectListRequest.execute();
-
- if (projectList.getProjects() != null) {
- List projects = projectList.getProjects();
- System.out.println("Project list:");
-
- for (ProjectList.Projects project : projects) {
- System.out.format("%s\n", project.getFriendlyName());
- }
- }
- }
- // [END listProjects]
-
- /**
- * Runs a synchronous BigQuery query and displays the result.
- *
- * @param bigquery An authorized BigQuery client
- * @param projectId The current project id
- * @param query A String containing a BigQuery SQL statement
- * @param out A PrintStream for output, normally System.out
- */
- static void runQueryRpcAndPrint(Bigquery bigquery, String projectId, String query,
- PrintStream out) throws IOException, InterruptedException {
- QueryRequest queryRequest = new QueryRequest().setQuery(query);
- QueryResponse queryResponse = bigquery.jobs().query(projectId, queryRequest).execute();
- if (queryResponse.getJobComplete()) {
- printRows(queryResponse.getRows(), out);
- if (null == queryResponse.getPageToken()) {
- return;
- }
- }
- // This loop polls until results are present, then loops over result pages.
- String pageToken = null;
- while (true) {
- GetQueryResultsResponse queryResults = bigquery.jobs()
- .getQueryResults(projectId, queryResponse.getJobReference().getJobId())
- .setPageToken(pageToken).execute();
- if (queryResults.getJobComplete()) {
- printRows(queryResults.getRows(), out);
- pageToken = queryResults.getPageToken();
- if (null == pageToken) {
- return;
- }
- }
- Thread.sleep(500);
- }
- }
-
- /**
- * Print the given rows.
- *
- * @param rows the rows to print.
- * @param out the place to print them.
- */
- private static void printRows(java.util.List rows, PrintStream out) {
- if (rows != null) {
- for (TableRow row : rows) {
- for (TableCell cell : row.getF()) {
- // Data.isNull() is the recommended way to check for the 'null object' in TableCell.
- out.printf("%s, ", Data.isNull(cell.getV()) ? "null" : cell.getV().toString());
- }
- out.println();
- }
- }
- }
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/LoadDataCsvSample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/LoadDataCsvSample.java
deleted file mode 100644
index 28367529a68..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/LoadDataCsvSample.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- Copyright 2015, 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.google.cloud.bigquery.samples;
-
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.model.Job;
-import com.google.api.services.bigquery.model.JobConfiguration;
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.Scanner;
-
-/**
- * Cli tool to load data from a CSV into Bigquery.
- */
-public class LoadDataCsvSample {
-
- /**
- * Protected constructor since this is a collection of static methods.
- */
- protected LoadDataCsvSample() {
- }
-
- /**
- * Cli tool to load data from a CSV into Bigquery.
- * @param args Command line args, should be empty
- * @throws IOException IOException
- * @throws InterruptedException InterruptedException
- */
- // [START main]
- public static void main(final String[] args)
- throws IOException, InterruptedException {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Enter your project id: ");
- String projectId = scanner.nextLine();
- System.out.println("Enter your dataset id: ");
- String datasetId = scanner.nextLine();
- System.out.println("Enter your table id: ");
- String tableId = scanner.nextLine();
- System.out.println("Enter the Google Cloud Storage Path to the data "
- + "you'd like to load: ");
- String cloudStoragePath = scanner.nextLine();
- System.out.println("Enter the filepath to your schema: ");
- String sourceSchemaPath = scanner.nextLine();
-
-
- System.out.println("Enter how often to check if your job is complete "
- + "(milliseconds): ");
- long interval = scanner.nextLong();
- scanner.close();
-
- run(cloudStoragePath,
- projectId,
- datasetId,
- tableId,
- new FileReader(new File(sourceSchemaPath)),
- interval);
- }
- // [END main]
-
- /**
- * Run the bigquery ClI.
- * @param cloudStoragePath The bucket we are using
- * @param projectId Project id
- * @param datasetId datasetid
- * @param tableId tableid
- * @param schemaSource Source of the schema
- * @param interval interval to wait between polling in milliseconds
- * @throws IOException Thrown if there is an error connecting to Bigquery.
- * @throws InterruptedException Should never be thrown
- */
- // [START run]
- public static void run(
- final String cloudStoragePath,
- final String projectId,
- final String datasetId,
- final String tableId,
- final Reader schemaSource,
- final long interval) throws IOException, InterruptedException {
-
- Bigquery bigquery = BigqueryServiceFactory.getService();
-
-
- Job loadJob = loadJob(
- bigquery,
- cloudStoragePath,
- new TableReference()
- .setProjectId(projectId)
- .setDatasetId(datasetId)
- .setTableId(tableId),
- BigqueryUtils.loadSchema(schemaSource));
-
- Bigquery.Jobs.Get getJob = bigquery.jobs().get(
- loadJob.getJobReference().getProjectId(),
- loadJob.getJobReference().getJobId());
-
- BigqueryUtils.pollJob(getJob, interval);
-
- System.out.println("Load is Done!");
-
- }
- // [END run]
-
- /**
- * A job that extracts data from a table.
- * @param bigquery Bigquery service to use
- * @param cloudStoragePath Cloud storage bucket we are inserting into
- * @param table Table to extract from
- * @param schema The schema of the table we are loading into
- * @return The job to extract data from the table
- * @throws IOException Thrown if error connceting to Bigtable
- */
- // [START load_job]
- public static Job loadJob(
- final Bigquery bigquery,
- final String cloudStoragePath,
- final TableReference table,
- final TableSchema schema) throws IOException {
-
- JobConfigurationLoad load = new JobConfigurationLoad()
- .setDestinationTable(table)
- .setSchema(schema)
- .setSourceUris(Collections.singletonList(cloudStoragePath));
-
- return bigquery.jobs().insert(table.getProjectId(),
- new Job().setConfiguration(new JobConfiguration().setLoad(load)))
- .execute();
- }
- // [END load_job]
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/StreamingSample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/StreamingSample.java
deleted file mode 100644
index 3f2aed4b747..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/StreamingSample.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- Copyright 2015, 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.google.cloud.bigquery.samples;
-
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
-import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.stream.JsonReader;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Scanner;
-
-
-/**
- * Example of Bigquery Streaming.
- */
-public class StreamingSample {
-
- /**
- * Empty constructor since this is just a collection of static methods.
- */
- protected StreamingSample() {
- }
-
-
- /**
- * Command line that demonstrates Bigquery streaming.
- *
- * @param args Command line args, should be empty
- * @throws IOException IOexception
- */
- // [START main]
- public static void main(final String[] args) throws IOException {
- final Scanner scanner = new Scanner(System.in);
- System.out.println("Enter your project id: ");
- String projectId = scanner.nextLine();
- System.out.println("Enter your dataset id: ");
- String datasetId = scanner.nextLine();
- System.out.println("Enter your table id: ");
- String tableId = scanner.nextLine();
- scanner.close();
-
- System.out.println("Enter JSON to stream to BigQuery: \n"
- + "Press End-of-stream (CTRL-D) to stop");
-
- JsonReader fromCli = new JsonReader(new InputStreamReader(System.in));
-
- Iterator responses = run(projectId,
- datasetId,
- tableId,
- fromCli);
-
- while (responses.hasNext()) {
- System.out.println(responses.next());
- }
-
- fromCli.close();
- }
- // [END main]
-
-
- /**
- * Run the bigquery ClI.
- *
- * @param projectId Project id
- * @param datasetId datasetid
- * @param tableId tableid
- * @param rows The source of the JSON rows we are streaming in.
- * @return Returns Iterates through the stream responses
- * @throws IOException Thrown if there is an error connecting to Bigquery.
- * @throws InterruptedException Should never be thrown
- */
- // [START run]
- public static Iterator run(final String projectId,
- final String datasetId,
- final String tableId,
- final JsonReader rows) throws IOException {
-
-
- final Bigquery bigquery = BigqueryServiceFactory.getService();
- final Gson gson = new Gson();
- rows.beginArray();
-
- return new Iterator() {
-
- /**
- * Check whether there is another row to stream.
- *
- * @return True if there is another row in the stream
- */
- public boolean hasNext() {
- try {
- return rows.hasNext();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return false;
- }
-
- /**
- * Insert the next row, and return the response.
- *
- * @return Next page of data
- */
- public TableDataInsertAllResponse next() {
- try {
- Map rowData = gson.>fromJson(
- rows,
- (new HashMap()).getClass());
- return streamRow(bigquery,
- projectId,
- datasetId,
- tableId,
- new TableDataInsertAllRequest.Rows().setJson(rowData));
- } catch (JsonSyntaxException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public void remove() {
- this.next();
- }
-
- };
-
- }
- // [END run]
-
- /**
- * Stream the given row into the given bigquery table.
- *
- * @param bigquery The bigquery service
- * @param projectId project id from Google Developers console
- * @param datasetId id of the dataset
- * @param tableId id of the table we're streaming
- * @param row the row we're inserting
- * @return Response from the insert
- * @throws IOException ioexception
- */
- // [START streamRow]
- public static TableDataInsertAllResponse streamRow(final Bigquery bigquery,
- final String projectId,
- final String datasetId,
- final String tableId,
- final TableDataInsertAllRequest.Rows row) throws IOException {
-
- return bigquery.tabledata().insertAll(
- projectId,
- datasetId,
- tableId,
- new TableDataInsertAllRequest().setRows(
- Collections.singletonList(row))).execute();
- }
- // [END streamRow]
-}
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/SyncQuerySample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/SyncQuerySample.java
deleted file mode 100644
index 497f719c4a9..00000000000
--- a/bigquery/src/main/java/com/google/cloud/bigquery/samples/SyncQuerySample.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- Copyright 2015, 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.google.cloud.bigquery.samples;
-
-import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.Bigquery.Jobs.GetQueryResults;
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.api.services.bigquery.model.QueryRequest;
-import com.google.api.services.bigquery.model.QueryResponse;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Scanner;
-/**
- * Runs a synchronous query against Bigtable.
- */
-public class SyncQuerySample {
-
-
- /**
- * Protected because this is a collection of static methods.
- */
- protected SyncQuerySample() {
-
- }
-
- //[START main]
- /**
- * Prompts the user for the required parameters to perform a query.
- *
- * @param args args
- * @throws IOException ioexceptino
- */
- public static void main(final String[] args)
- throws IOException {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Enter your project id: ");
- String projectId = scanner.nextLine();
- System.out.println("Enter your query string: ");
- String queryString = scanner.nextLine();
- System.out.println("Enter how long to wait for the query to complete"
- + " (in milliseconds):\n "
- + "(if longer than 10 seconds, use an asynchronous query)");
- long waitTime = scanner.nextLong();
- scanner.close();
- Iterator pages = run(projectId, queryString,
- waitTime);
- while (pages.hasNext()) {
- BigqueryUtils.printRows(pages.next().getRows(), System.out);
- }
- }
- // [END main]
-
-
- /**
- * Perform the given query using the synchronous api.
- *
- * @param projectId project id from developer console
- * @param queryString query to run
- * @param waitTime Timeout in milliseconds before we abort
- * @return Iterator that pages through the results of the query
- * @throws IOException ioexception
- */
- // [START run]
- public static Iterator run(final String projectId,
- final String queryString,
- final long waitTime) throws IOException {
- Bigquery bigquery = BigqueryServiceFactory.getService();
- //Wait until query is done with 10 second timeout, at most 5 retries on error
- QueryResponse query = bigquery.jobs().query(
- projectId,
- new QueryRequest().setTimeoutMs(waitTime).setQuery(queryString))
- .execute();
-
- //Make a request to get the results of the query
- //(timeout is zero since job should be complete)
-
- GetQueryResults getRequest = bigquery.jobs().getQueryResults(
- query.getJobReference().getProjectId(),
- query.getJobReference().getJobId());
-
-
- return BigqueryUtils.getPages(getRequest);
- }
- // [END run]
-
-
-}
diff --git a/bigquery/src/main/resources/constants.json b/bigquery/src/main/resources/constants.json
deleted file mode 100644
index a1faa665d35..00000000000
--- a/bigquery/src/main/resources/constants.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "projectId": "cloud-samples-tests",
- "datasetId": "test_dataset_java",
- "currentTableId": "test_table_java",
- "newTableId": "test_table_java_2",
- "cloudStorageInputUri": "gs://cloud-samples-tests/data.csv",
- "cloudStorageOutputUri": "gs://cloud-samples-tests/output.csv",
- "query": "SELECT corpus FROM publicdata:samples.shakespeare GROUP BY corpus;"
-}
diff --git a/bigquery/src/main/resources/schema.json b/bigquery/src/main/resources/schema.json
deleted file mode 100644
index b61fd26be03..00000000000
--- a/bigquery/src/main/resources/schema.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"type": "STRING", "name": "Name"}, {"type": "INTEGER", "name": "Age"}, {"type": "FLOAT", "name": "Weight"}, {"type": "BOOLEAN", "name": "IsMagic"}]
diff --git a/bigquery/src/main/resources/streamrows.json b/bigquery/src/main/resources/streamrows.json
deleted file mode 100644
index c65f6291054..00000000000
--- a/bigquery/src/main/resources/streamrows.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {"Name": "test", "Age": 0, "Weight": 100.0, "IsMagic": false},
- {"Name": "test", "Age": 1, "Weight": 100.0, "IsMagic": false},
- {"Name": "test", "Age": 2, "Weight": 100.0, "IsMagic": false},
- {"Name": "test", "Age": 3, "Weight": 100.0, "IsMagic": false},
- {"Name": "test", "Age": 0, "Weight": 100.0, "IsMagic": false}
-]
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/AsyncQuerySampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/AsyncQuerySampleTest.java
deleted file mode 100644
index c6c886034b4..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/AsyncQuerySampleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.cloud.bigquery.samples.AsyncQuerySample;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-
-/**
- * Tests for asynchronous query sample.
- */
-public class AsyncQuerySampleTest extends BigquerySampleTest{
-
- public AsyncQuerySampleTest() throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- super();
- }
-
- @Test
- public void testInteractive() throws IOException, InterruptedException {
- Iterator pages =
- AsyncQuerySample.run(CONSTANTS.getProjectId(), CONSTANTS.getQuery(), false, 5000);
- while (pages.hasNext()) {
- assertThat(pages.next().getRows()).isNotEmpty();
- }
- }
-
- @Test
- @Ignore // Batches can take up to 3 hours to run, probably shouldn't use this
- public void testBatch() throws IOException, InterruptedException {
- Iterator pages =
- AsyncQuerySample.run(CONSTANTS.getProjectId(), CONSTANTS.getQuery(), true, 5000);
- while (pages.hasNext()) {
- assertThat(pages.next().getRows()).isNotEmpty();
- }
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/BigquerySampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/BigquerySampleTest.java
deleted file mode 100644
index 047f9b249d5..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/BigquerySampleTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import com.google.cloud.bigquery.samples.BigqueryUtils;
-import com.google.gson.Gson;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Superclass for tests for samples.
- */
-public class BigquerySampleTest extends BigqueryUtils {
-
- protected static class Constants {
- private String projectId;
- private String datasetId;
- private String currentTableId;
- private String newTableId;
- private String cloudStorageInputUri;
- private String cloudStorageOutputUri;
- private String query;
-
- public String getProjectId() {
- return projectId;
- }
-
- public String getDatasetId() {
- return datasetId;
- }
-
- public String getCurrentTableId() {
- return currentTableId;
- }
-
- public String getNewTableId() {
- return newTableId;
- }
-
- public String getQuery() {
- return query;
- }
-
- public String getCloudStorageOutputUri() {
- return cloudStorageOutputUri;
- }
-
- public String getCloudStorageInputUri() {
- return cloudStorageInputUri;
- }
- }
-
- @SuppressWarnings("checkstyle:abbreviationaswordinname")
- protected static Constants CONSTANTS = null;
-
- protected BigquerySampleTest()
- throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- if (CONSTANTS == null) {
- InputStream is = this.getClass().getResourceAsStream("/constants.json");
- CONSTANTS = (new Gson()).fromJson(new InputStreamReader(is), Constants.class);
- }
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ExportDataCloudStorageSampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ExportDataCloudStorageSampleTest.java
deleted file mode 100644
index 3de3fdd4c58..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ExportDataCloudStorageSampleTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import com.google.cloud.bigquery.samples.ExportDataCloudStorageSample;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-/**
- * Tests for export data Cloud Storage sample.
- */
-public class ExportDataCloudStorageSampleTest extends BigquerySampleTest {
-
- public ExportDataCloudStorageSampleTest()
- throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- super();
- }
-
- @Test
- public void testExportData() throws IOException, InterruptedException {
- ExportDataCloudStorageSample.run(
- CONSTANTS.getCloudStorageOutputUri(),
- CONSTANTS.getProjectId(),
- CONSTANTS.getDatasetId(),
- CONSTANTS.getCurrentTableId(),
- 5000L);
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/GettingStartedTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/GettingStartedTest.java
deleted file mode 100644
index 0f688239cee..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/GettingStartedTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.cloud.bigquery.samples.GettingStarted;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintStream;
-
-
-/**
- * Test for GettingStarted.java
- */
-public class GettingStartedTest extends BigquerySampleTest {
- private static final PrintStream REAL_OUT = System.out;
- private static final PrintStream REAL_ERR = System.err;
-
- private final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
- private final ByteArrayOutputStream stderr = new ByteArrayOutputStream();
-
- public GettingStartedTest() throws FileNotFoundException {
- super();
- }
-
- @Before
- public void setUp() {
- System.setOut(new PrintStream(stdout));
- System.setErr(new PrintStream(stderr));
- }
-
- @After
- public void tearDown() {
- System.setOut(REAL_OUT);
- System.setErr(REAL_ERR);
- }
-
- @Test
- public void testSyncQuery() throws IOException {
- GettingStarted.main(new String[] { CONSTANTS.getProjectId() });
- String out = stdout.toString();
- assertThat(out).named("stdout").containsMatch("Query Results:");
- assertThat(out).named("stdout").contains("hamlet");
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ListDatasetsProjectsTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ListDatasetsProjectsTest.java
deleted file mode 100644
index d4ebaeac2b9..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/ListDatasetsProjectsTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.cloud.bigquery.samples.ListDatasetsProjects;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-import java.lang.Exception;
-
-/**
- * Unit tests for {@link ListDatasetsProjects}.
- */
-public class ListDatasetsProjectsTest extends BigquerySampleTest {
- private static final PrintStream REAL_OUT = System.out;
- private static final PrintStream REAL_ERR = System.err;
-
- private final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
- private final ByteArrayOutputStream stderr = new ByteArrayOutputStream();
-
- public ListDatasetsProjectsTest() throws FileNotFoundException {
- super();
- }
-
- @Before
- public void setUp() {
- System.setOut(new PrintStream(stdout));
- System.setErr(new PrintStream(stderr));
- }
-
- @After
- public void tearDown() {
- System.setOut(REAL_OUT);
- System.setErr(REAL_ERR);
- }
-
- @Test
- public void testUsage() throws Exception {
- ListDatasetsProjects.main(new String[] {});
- assertThat(stderr.toString()).named("stderr").isEqualTo("Usage: QuickStart \n");
- }
-
- @Test
- public void testMain() throws Exception {
- ListDatasetsProjects.main(new String[] { CONSTANTS.getProjectId() });
- String out = stdout.toString();
- assertThat(out).named("stdout").contains("Running the asynchronous query");
- assertThat(out).named("stdout").containsMatch("George W. Bush, [0-9]+");
- assertThat(out).named("stdout").containsMatch("Wikipedia, [0-9]+");
-
- assertThat(out).named("stdout").contains("Listing all the Datasets");
- assertThat(out).named("stdout").contains("test_dataset");
-
- assertThat(out).named("stdout").contains("Listing all the Projects");
- assertThat(out).named("stdout").contains("Project list:");
- assertThat(out).named("stdout").containsMatch("Bigquery Samples|cloud-samples-tests");
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/LoadDataCsvSampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/LoadDataCsvSampleTest.java
deleted file mode 100644
index c87626cadf0..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/LoadDataCsvSampleTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import com.google.cloud.bigquery.samples.LoadDataCsvSample;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Tests for sample that loads data from CSV.
- */
-public class LoadDataCsvSampleTest extends BigquerySampleTest {
-
- public LoadDataCsvSampleTest()
- throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- super();
- }
-
- @Test
- public void testLoadData() throws IOException, InterruptedException {
- InputStreamReader is =
- new InputStreamReader(LoadDataCsvSample.class.getResourceAsStream("/schema.json"));
- LoadDataCsvSample.run(
- CONSTANTS.getCloudStorageInputUri(),
- CONSTANTS.getProjectId(),
- CONSTANTS.getDatasetId(),
- CONSTANTS.getNewTableId(),
- is,
- 5000L);
- }
-
-
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/StreamingSampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/StreamingSampleTest.java
deleted file mode 100644
index b0624f23c01..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/StreamingSampleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
-import com.google.cloud.bigquery.samples.StreamingSample;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.stream.JsonReader;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-
-/**
- * Tests for streaming sample.
- */
-public class StreamingSampleTest extends BigquerySampleTest {
-
- public StreamingSampleTest() throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- super();
- }
-
- @Test
- public void testStream() throws IOException {
- JsonReader json =
- new JsonReader(
- new InputStreamReader(
- BigquerySampleTest.class.getResourceAsStream("/streamrows.json")));
- Iterator response =
- StreamingSample.run(
- CONSTANTS.getProjectId(),
- CONSTANTS.getDatasetId(),
- CONSTANTS.getCurrentTableId(),
- json);
-
- while (response.hasNext()) {
- assertThat(response.next()).isNotEmpty();
- }
- }
-}
diff --git a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/SyncQuerySampleTest.java b/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/SyncQuerySampleTest.java
deleted file mode 100644
index de52abb1f3d..00000000000
--- a/bigquery/src/test/java/com/google/cloud/bigquery/samples/test/SyncQuerySampleTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 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.google.cloud.bigquery.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.bigquery.model.GetQueryResultsResponse;
-import com.google.cloud.bigquery.samples.SyncQuerySample;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-
-/**
- * Tests for synchronous query sample.
- */
-public class SyncQuerySampleTest extends BigquerySampleTest {
-
- public SyncQuerySampleTest()
- throws JsonSyntaxException, JsonIOException, FileNotFoundException {
- super();
- }
-
- @Test
- public void testSyncQuery() throws IOException {
- Iterator pages =
- SyncQuerySample.run(
- CONSTANTS.getProjectId(),
- CONSTANTS.getQuery(),
- 10000);
- while (pages.hasNext()) {
- assertThat(pages.next().getRows()).isNotEmpty();
- }
- }
-}
diff --git a/compute/cmdline/ComputeEngineSample.launch b/compute/cmdline/ComputeEngineSample.launch
deleted file mode 100644
index cee07bc5266..00000000000
--- a/compute/cmdline/ComputeEngineSample.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/compute/cmdline/README.md b/compute/cmdline/README.md
deleted file mode 100644
index adaf3d67a8d..00000000000
--- a/compute/cmdline/README.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# Compute Engine - Getting started with Java
-
-This sample command line application demonstrates how to access the Google
-Compute Engine API using the Google Java API Client Library.
-
-When the sample is setup and run as instructed below, it will list all the
-VM instances in a Google Cloud Platform project for a specific
-[zone](https://cloud.google.com/compute/docs/zones).
-The sample also checks for the existence of a VM instance named
-"my-sample-instance". If the VM instance doesn't exist, the sample
-will create a new VM instance named "my-sample-instance". If the VM instance
-does exist, running the sample will delete the instance. The instance create
-and delete actions are implemented as
-"[zone specific operations](https://cloud.google.com/compute/docs/reference/latest/zoneOperations#resource)".
-The sample demonstrates how to poll the status of these operations to
-determine when and if they successfully complete.
-
-## Products
-- [Compute Engine][1]
-
-## Language
-- [Java][2]
-
-## APIs
-- [Google Compute Engine][3]
-
-## Setup Instructions
-1. Create or select a project in the Google Cloud Console:
- 1. Visit the [Cloud Console][4]
- 1. If this is your first time then click "Create Project," otherwise you can
-reuse an existing project by clicking on it.
- 1. Note: You will need to enable billing for the project to use Compute
- Engine.
- 1. Click "Overview" in the left-side navigation menu and copy your Project ID
- for use in step 3.3 below.
-
-1. Authentication instructions to run the sample (on your local machine or on a Compute Engine VM):
- * Running the sample locally on your development machine:
- 1. Install [Google Cloud SDK](https://cloud.google.com/sdk/)
- 1. Run the following command to authorize the Cloud SDK and configure your project:
-
gcloud init
- * Running the sample on a Google Compute Engine VM using Default Application
- Credentials:
- 1. Create a Compute Engine VM Instance.
- 1. In the [Cloud Console](https://console.cloud.google.com/project)
- go to the Compute > Compute Engine section.
- 1. Click the "Create instance" button.
- 1. For the 'Boot Disk' select a Linux machine image like Debian or Ubuntu.
- 1. Click the "Management, disk, networking, access & security options"
- section to expand it.
- 1. Select the "Access and Security" subsection and then select the
- "Compute" drop-down menu to set its scope.
- * Set the "Compute" access scope to be "Read/Write".
- 1. Click the "Create" button.
- 1. Once the VM is created click the VM instance's "SSH" button to ssh
- in to the newly created VM instance.
-
-1. Code checkout instructions:
- 1. Prerequisites: install [Java 7 or Java 8 JDK][2], [Git][7], and [Maven][8].
-You may need to set your `JAVA_HOME` environment variable as well.
- * To install these prerequisites on a Linux (Debian or Ubuntu) based Compute Engine VM
- instance, run these commands:
-
- 1. Download the sample code by running the following commands:
-
mkdir some_directory
- cd some_directory
- git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
- cd java-docs-samples/compute/cmdline
- In a text editor open the `ComputeEngineSample.java` file. For example, to edit the file with nano:
-
nano src/main/java/ComputeEngineSample.java
-
- 1. In your text editor update the `YOUR_PROJECT_ID` value in
- [`src/main/java/ComputeEngineSample.java`][5]
-so that the following line is updated. Not performing this step will result
-in an error; specifically, "Parameter 'project' must conform to the pattern...".
-For more information see setting your [Project ID][6].
-
private static final String projectId = "YOUR_PROJECT_ID"
- 1. Specify an 'Application Name' for your app by updating the following line of code:
-
private static final String APPLICATION_NAME = "";
- 1. Save the changes to the file and exit the text editor.
-
-1. Compile and run the sample:
- 1. Compile the sample code using Maven by running the following command:
-
mvn compile
- 1. Execute the sample code using Maven by running the following command:
-
mvn -q exec:java
- 1. Running the sample will list all Google Compute Engine VM instances found in
- the zone you specified. The sample will also check for the existence of a VM instance
- named "my-sample-instance". If the "my-sample-instance" VM does not exist, running the
- sample will create it. If the "my-sample-instance" VM does already exist then running the
- sample will delete it.
-
- You can verify the list of VM instances by running the command
- `gcloud compute instances list`. VM instances can be deleted with the 'gcloud compute instance delete'
- command. For example, this command will delete the 'my-sample-instance' VM instance
- in the zone 'us-central1-f':
-
- `gcloud compute instances delete my-sample-instance --zone us-central1-f`
-
-1. Importing the code into Eclipse and running it from there:
- 1. Prerequisites: install [Eclipse][9] and the [Maven plugin for Eclipse][10].
- 1. Download code as specified above.
- 1. File -> Import -> Maven -> Existing Maven Projects -> Next.
- 1. Select your project directory as your "Root Directory," and click "Finish."
- 1. Right-click on project compute-engine-cmdline-sample.
- 1. Run As > Java Application.
- 1. If asked, type or select "ComputeEngineSample" and click OK.
- 1. Application output will display in the Eclipse Console.
-
-[1]: https://cloud.google.com/compute/
-[2]: http://java.com/en/download/faq/develop.xml
-[3]: https://cloud.google.com/compute/
-[4]: https://console.cloud.google.com/project
-[5]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/compute/cmdline/src/main/java/ComputeEngineSample.java#L54
-[6]: https://support.google.com/cloud/answer/6158840
-[7]: http://git-scm.com/downloads
-[8]: http://maven.apache.org/download.html
-[9]: http://www.eclipse.org/downloads/
-[10]: http://download.eclipse.org/technology/m2e/releases/
diff --git a/compute/cmdline/logging.properties b/compute/cmdline/logging.properties
deleted file mode 100644
index 40072d61c26..00000000000
--- a/compute/cmdline/logging.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Properties file which configures the operation of the JDK logging facility.
-# The system will look for this config file to be specified as a system property:
-# -Djava.util.logging.config.file=${project_loc:compute-engine-cmdline-sample}/logging.properties
-
-# Set up the console handler (uncomment "level" to show more fine-grained messages)
-handlers = java.util.logging.ConsoleHandler
-#java.util.logging.ConsoleHandler.level = CONFIG
-
-# Set up logging of HTTP requests and responses (uncomment "level" to show)
-#com.google.api.client.http.level = CONFIG
diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
deleted file mode 100644
index fab344b731b..00000000000
--- a/compute/cmdline/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
- 4.0.0
- com.google.cloud.samples
- compute-cmdline
- 1
-
-
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
-
- maven-compiler-plugin
- 3.5.1
-
- 1.7
- 1.7
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.4.0
-
-
-
- java
-
-
-
-
- ComputeEngineSample
-
-
- java.util.logging.config.file
- logging.properties
-
-
-
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
- 3.0.3
-
- false
-
-
-
-
- check
-
-
-
-
-
- ${project.artifactId}-${project.version}
-
-
-
- com.google.api-client
- google-api-client
- 1.22.0
-
-
- com.google.apis
- google-api-services-compute
- ${project.compute.version}
-
-
-
- v1-rev105-1.21.0
- UTF-8
-
-
diff --git a/compute/cmdline/src/main/java/ComputeEngineSample.java b/compute/cmdline/src/main/java/ComputeEngineSample.java
deleted file mode 100644
index 1a389e81392..00000000000
--- a/compute/cmdline/src/main/java/ComputeEngineSample.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.compute.Compute;
-import com.google.api.services.compute.ComputeScopes;
-import com.google.api.services.compute.model.AccessConfig;
-import com.google.api.services.compute.model.AttachedDisk;
-import com.google.api.services.compute.model.AttachedDiskInitializeParams;
-import com.google.api.services.compute.model.Instance;
-import com.google.api.services.compute.model.InstanceList;
-import com.google.api.services.compute.model.Metadata;
-import com.google.api.services.compute.model.NetworkInterface;
-import com.google.api.services.compute.model.Operation;
-import com.google.api.services.compute.model.ServiceAccount;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Command-line sample to demo listing Google Compute Engine instances using Java and the Google
- * Compute Engine API.
- *
- * @author Jonathan Simon
- */
-public class ComputeEngineSample {
-
- /**
- * Be sure to specify the name of your application. If the application name is {@code null} or
- * blank, the application will log a warning. Suggested format is "MyCompany-ProductName/1.0".
- */
- private static final String APPLICATION_NAME = "";
-
- /** Set PROJECT_ID to your Project ID from the Overview pane in the Developers console. */
- private static final String PROJECT_ID = "YOUR_PROJECT_ID";
-
- /** Set Compute Engine zone. */
- private static final String ZONE_NAME = "us-central1-f";
-
- /** Set the name of the sample VM instance to be created. */
- private static final String SAMPLE_INSTANCE_NAME = "my-sample-instance";
-
- /** Set the path of the OS image for the sample VM instance to be created. */
- private static final String SOURCE_IMAGE_PREFIX = "https://www.googleapis.com/compute/v1/projects/";
- private static final String SOURCE_IMAGE_PATH =
- "debian-cloud/global/images/debian-7-wheezy-v20150710";
-
- /** Set the Network configuration values of the sample VM instance to be created. */
- private static final String NETWORK_INTERFACE_CONFIG = "ONE_TO_ONE_NAT";
- private static final String NETWORK_ACCESS_CONFIG = "External NAT";
-
- /** Set the time out limit for operation calls to the Compute Engine API. */
- private static final long OPERATION_TIMEOUT_MILLIS = 60 * 1000;
-
- /** Global instance of the HTTP transport. */
- private static HttpTransport httpTransport;
-
- /** Global instance of the JSON factory. */
- private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
-
-
-
- public static void main(String[] args) {
- try {
- httpTransport = GoogleNetHttpTransport.newTrustedTransport();
-
- // Authenticate using Google Application Default Credentials.
- GoogleCredential credential = GoogleCredential.getApplicationDefault();
- if (credential.createScopedRequired()) {
- List scopes = new ArrayList<>();
- // Set Google Cloud Storage scope to Full Control.
- scopes.add(ComputeScopes.DEVSTORAGE_FULL_CONTROL);
- // Set Google Compute Engine scope to Read-write.
- scopes.add(ComputeScopes.COMPUTE);
- credential = credential.createScoped(scopes);
- }
-
- // Create Compute Engine object for listing instances.
- Compute compute =
- new Compute.Builder(httpTransport, JSON_FACTORY, credential)
- .setApplicationName(APPLICATION_NAME)
- .build();
-
- // List out instances, looking for the one created by this sample app.
- boolean foundOurInstance = printInstances(compute);
-
- Operation op;
- if (foundOurInstance) {
- op = deleteInstance(compute, SAMPLE_INSTANCE_NAME);
- } else {
- op = startInstance(compute, SAMPLE_INSTANCE_NAME);
- }
-
- // Call Compute Engine API operation and poll for operation completion status
- System.out.println("Waiting for operation completion...");
- Operation.Error error = blockUntilComplete(compute, op, OPERATION_TIMEOUT_MILLIS);
- if (error == null) {
- System.out.println("Success!");
- } else {
- System.out.println(error.toPrettyString());
- }
- } catch (IOException e) {
- System.err.println(e.getMessage());
- } catch (Throwable t) {
- t.printStackTrace();
- }
- System.exit(1);
- }
-
- // [START list_instances]
- /**
- * Print available machine instances.
- *
- * @param compute The main API access point
- * @return {@code true} if the instance created by this sample app is in the list
- */
- public static boolean printInstances(Compute compute) throws IOException {
- System.out.println("================== Listing Compute Engine Instances ==================");
- Compute.Instances.List instances = compute.instances().list(PROJECT_ID, ZONE_NAME);
- InstanceList list = instances.execute();
- boolean found = false;
- if (list.getItems() == null) {
- System.out.println("No instances found. Sign in to the Google Developers Console and create "
- + "an instance at: https://console.developers.google.com/");
- } else {
- for (Instance instance : list.getItems()) {
- System.out.println(instance.toPrettyString());
- if (instance.getName().equals(SAMPLE_INSTANCE_NAME)) {
- found = true;
- }
- }
- }
- return found;
- }
- // [END list_instances]
-
- // [START create_instances]
- public static Operation startInstance(Compute compute, String instanceName) throws IOException {
- System.out.println("================== Starting New Instance ==================");
-
-
- // Create VM Instance object with the required properties.
- Instance instance = new Instance();
- instance.setName(instanceName);
- instance.setMachineType(
- "https://www.googleapis.com/compute/v1/projects/"
- + PROJECT_ID + "/zones/" + ZONE_NAME + "/machineTypes/n1-standard-1");
-
- // Add Network Interface to be used by VM Instance.
- NetworkInterface ifc = new NetworkInterface();
- ifc.setNetwork("https://www.googleapis.com/compute/v1/projects/" + PROJECT_ID + "/global/networks/default");
- List configs = new ArrayList<>();
- AccessConfig config = new AccessConfig();
- config.setType(NETWORK_INTERFACE_CONFIG);
- config.setName(NETWORK_ACCESS_CONFIG);
- configs.add(config);
- ifc.setAccessConfigs(configs);
- instance.setNetworkInterfaces(Collections.singletonList(ifc));
-
- // Add attached Persistent Disk to be used by VM Instance.
- AttachedDisk disk = new AttachedDisk();
- disk.setBoot(true);
- disk.setAutoDelete(true);
- disk.setType("PERSISTENT");
- AttachedDiskInitializeParams params = new AttachedDiskInitializeParams();
- // Assign the Persistent Disk the same name as the VM Instance.
- params.setDiskName(instanceName);
- // Specify the source operating system machine image to be used by the VM Instance.
- params.setSourceImage(SOURCE_IMAGE_PREFIX + SOURCE_IMAGE_PATH);
- // Specify the disk type as Standard Persistent Disk
- params.setDiskType("https://www.googleapis.com/compute/v1/projects/" + PROJECT_ID + "/zones/"
- + ZONE_NAME + "/diskTypes/pd-standard");
- disk.setInitializeParams(params);
- instance.setDisks(Collections.singletonList(disk));
-
- // Initialize the service account to be used by the VM Instance and set the API access scopes.
- ServiceAccount account = new ServiceAccount();
- account.setEmail("default");
- List scopes = new ArrayList<>();
- scopes.add("https://www.googleapis.com/auth/devstorage.full_control");
- scopes.add("https://www.googleapis.com/auth/compute");
- account.setScopes(scopes);
- instance.setServiceAccounts(Collections.singletonList(account));
-
- // Optional - Add a startup script to be used by the VM Instance.
- Metadata meta = new Metadata();
- Metadata.Items item = new Metadata.Items();
- item.setKey("startup-script-url");
- // If you put a script called "vm-startup.sh" in this Google Cloud Storage
- // bucket, it will execute on VM startup. This assumes you've created a
- // bucket named the same as your PROJECT_ID.
- // For info on creating buckets see: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets
- item.setValue("gs://" + PROJECT_ID + "/vm-startup.sh");
- meta.setItems(Collections.singletonList(item));
- instance.setMetadata(meta);
-
- System.out.println(instance.toPrettyString());
- Compute.Instances.Insert insert = compute.instances().insert(PROJECT_ID, ZONE_NAME, instance);
- return insert.execute();
- }
- // [END create_instances]
-
- private static Operation deleteInstance(Compute compute, String instanceName) throws Exception {
- System.out.println(
- "================== Deleting Instance " + instanceName + " ==================");
- Compute.Instances.Delete delete =
- compute.instances().delete(PROJECT_ID, ZONE_NAME, instanceName);
- return delete.execute();
- }
-
- // [START wait_until_complete]
- /**
- * Wait until {@code operation} is completed.
- * @param compute the {@code Compute} object
- * @param operation the operation returned by the original request
- * @param timeout the timeout, in millis
- * @return the error, if any, else {@code null} if there was no error
- * @throws InterruptedException if we timed out waiting for the operation to complete
- * @throws IOException if we had trouble connecting
- */
- public static Operation.Error blockUntilComplete(
- Compute compute, Operation operation, long timeout) throws Exception {
- long start = System.currentTimeMillis();
- final long pollInterval = 5 * 1000;
- String zone = operation.getZone(); // null for global/regional operations
- if (zone != null) {
- String[] bits = zone.split("/");
- zone = bits[bits.length - 1];
- }
- String status = operation.getStatus();
- String opId = operation.getName();
- while (operation != null && !status.equals("DONE")) {
- Thread.sleep(pollInterval);
- long elapsed = System.currentTimeMillis() - start;
- if (elapsed >= timeout) {
- throw new InterruptedException("Timed out waiting for operation to complete");
- }
- System.out.println("waiting...");
- if (zone != null) {
- Compute.ZoneOperations.Get get = compute.zoneOperations().get(PROJECT_ID, zone, opId);
- operation = get.execute();
- } else {
- Compute.GlobalOperations.Get get = compute.globalOperations().get(PROJECT_ID, opId);
- operation = get.execute();
- }
- if (operation != null) {
- status = operation.getStatus();
- }
- }
- return operation == null ? null : operation.getError();
- }
- // [END wait_until_complete]
-}
diff --git a/compute/error-reporting/README.md b/compute/error-reporting/README.md
deleted file mode 100644
index 56448476ac9..00000000000
--- a/compute/error-reporting/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Stackdriver sample for Google Compute Engine
-This sample demonstrates how to use [Stackdriver](https://cloud.google.com/error-reporting/) on Google Compute Engine
-## Running on Compute Engine
-1. Create a compute instance on the Google Cloud Platform Developer's Console
-1. SSH into the instance you created
-1. Update packages and install required packages
- `sudo apt-get update && sudo apt-get install git-core openjdk-8-jdk maven`
-1. Follow the instructions to [Install the Stackdriver Logging Agent](https://cloud.google.com/logging/docs/agent/installation)
-1. Create /etc/google-fluentd/config.d/forward.conf and add
-
- ```xml
-
- type forward
- port 24224
-
- ```
-
-1. Restart the logging agent
-
- `sudo service google-fluentd restart`
-
-1. Clone the repo
-
- `git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git`
-
-1. Navigate to the Stackdriver sample folder
-
- `java-docs-samples/compute/stackdriver`
-
-1. Make sure that openjdk 8 is the selected java version
-
- `sudo update-alternatives --config java`
-
-1. Use maven to package the class as a jar
-
- `mvn clean package`
-
-1. Switch to the target folder and execute the jar file
-
- `java -jar compute-stackdriver-1.0-SNAPSHOT-jar-with-dependencies.jar`
-
-1. On the Developer's Console, navigate to Stackdriver Error Reporting and verify that the sample
- error was logged.
diff --git a/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml
deleted file mode 100644
index 2974bc78b09..00000000000
--- a/compute/error-reporting/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- jar
- 1.0-SNAPSHOT
- com.example.compute
- compute-error-reporting
-
-
-
-
- org.fluentd
- fluent-logger
- 0.3.2
-
-
-
-
-
-
- maven-assembly-plugin
-
-
- package
-
- single
-
-
-
-
-
-
- com.example.compute.errorreporting.ExceptionUtil
-
-
-
- jar-with-dependencies
-
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
-
-
diff --git a/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java b/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java
deleted file mode 100644
index e2a0fe4f272..00000000000
--- a/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.compute.errorreporting;
-
-import org.fluentd.logger.FluentLogger;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-// [START example]
-public class ExceptionUtil {
- private static FluentLogger ERRORS = FluentLogger.getLogger("myapp");
-
- public static void main(String[] args) {
- try {
- throw new Exception("Generic exception for testing Stackdriver");
- } catch (Exception e) {
- report(e);
- }
- }
-
- public static void report(Throwable ex) {
- StringWriter exceptionWriter = new StringWriter();
- ex.printStackTrace(new PrintWriter(exceptionWriter));
- Map data = new HashMap<>();
- data.put("message", exceptionWriter.toString());
- Map serviceContextData = new HashMap<>();
- serviceContextData.put("service", "myapp");
- data.put("serviceContext", serviceContextData);
- // ... add more metadata
- ERRORS.log("errors", data);
- }
-}
-// [END example]
diff --git a/compute/mailjet/README.md b/compute/mailjet/README.md
deleted file mode 100644
index cbed566b724..00000000000
--- a/compute/mailjet/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Java Mailjet Email Sample for Google Compute Engine
-
-This sample demonstrates how to use [Mailjet](https://www.mailjet.com/) on
-[Google Compute Engine](https://cloud.google.com/compute/)
-
-See the [sample application documentaion][sample-docs] for more detailed
-instructions.
-
-For more information about Mailjet, see their
-[documentation](http://dev.mailjet.com/email-api/v3/apikey/).
-
-[sample-docs]: https://cloud.google.com/compute/docs/tutorials/sending-mail/
-
-## Running on Compute Engine
-
-To run the sample, you will need to do the following:
-
-1. [Create a Mailjet Account](https://app.mailjet.com/signup).
-1. Create a compute instance on the Google Cloud Platform Developer's Console
-1. SSH into the instance you created
-1. Update packages and install required packages
-
- `sudo apt-get update && sudo apt-get install git-core openjdk-8-jdk maven`
-
-1. Clone the repo
-
- `git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git`
-
-1. Configure your Mailjet settings in the java class (MAILJET_API_KEY, SENDGRID_SENDER)
-
- `java-docs-samples/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java`
-
-1. Navigate back to ./Mailjet and use maven to package the class as a jar
-
- `mvn clean package`
-
-1. Make sure that openjdk 8 is the selected java version
-
- `sudo update-alternatives --config java`
-
-1. Execute the jar file with your intended recipient and sender emails as arguments
- and send an email (make sure you are in the target folder)
-
- `java -jar compute-mailjet-1.0-SNAPSHOT-jar-with-dependencies.jar [RECIPIENT EMAIL] [SENDER EMAIL]`
diff --git a/compute/mailjet/pom.xml b/compute/mailjet/pom.xml
deleted file mode 100644
index f9e7cf30bff..00000000000
--- a/compute/mailjet/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
- 4.0.0
- jar
- 1.0-SNAPSHOT
- com.example.compute
- compute-mailjet
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-all
- 1.10.19
- test
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.mailjet
- mailjet-client
- 4.0.1
-
-
-
-
-
-
- maven-assembly-plugin
-
-
- package
-
- single
-
-
-
-
-
-
- com.example.compute.mailjet.MailjetSender
-
-
-
- jar-with-dependencies
-
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
-
-
diff --git a/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java b/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java
deleted file mode 100644
index 93a06515a3e..00000000000
--- a/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.compute.mailjet;
-
-// [START mailjet_imports]
-import com.mailjet.client.MailjetClient;
-import com.mailjet.client.MailjetRequest;
-import com.mailjet.client.MailjetResponse;
-import com.mailjet.client.errors.MailjetException;
-import com.mailjet.client.resource.Email;
-// [END mailjet_imports]
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-// [START app]
-public class MailjetSender{
-
- public static void main(String[] args) {
- final String mailjetApiKey = "YOUR-MAILJET-API-KEY";
- final String mailjetSecretKey = "YOUR-MAILJET-SECRET-KEY";
- MailjetClient client = new MailjetClient(mailjetApiKey, mailjetSecretKey);
-
- MailjetSender sender = new MailjetSender();
- sender.sendMailjet(args[0], args[1], client);
- }
-
- public MailjetResponse sendMailjet(String recipient, String sender, MailjetClient client) {
- MailjetRequest email = new MailjetRequest(Email.resource)
- .property(Email.FROMEMAIL, sender)
- .property(Email.FROMNAME, "pandora")
- .property(Email.SUBJECT, "Your email flight plan!")
- .property(Email.TEXTPART,
- "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
- .property(Email.HTMLPART,
- "
Dear passenger, welcome to Mailjet!
May the delivery force be with you!")
- .property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
-
- try {
- // trigger the API call
- MailjetResponse response = client.post(email);
- // Read the response data and status
- System.out.println(response.getStatus());
- System.out.println(response.getData());
- return response;
- } catch (MailjetException e) {
- System.out.println("Mailjet Exception: " + e);
- return null;
- }
- }
-}
-// [END app]
diff --git a/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java b/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java
deleted file mode 100644
index 6212a05aa10..00000000000
--- a/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.compute.mailjet;
-
-import com.mailjet.client.MailjetClient;
-import com.mailjet.client.MailjetResponse;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-/**
- * Unit tests for {@link MailjetSender}.
- */
-@RunWith(JUnit4.class)
-public class MailjetSenderTest {
-
- @Mock MailjetClient mockClient;
- @Mock MailjetResponse mockResponse;
- private MailjetSender sender;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
-
- Mockito.when(mockClient.post(Matchers.anyObject())).thenReturn(mockResponse);
- sender = new MailjetSender();
- }
-
- @Test
- public void doGet_defaultEnvironment_writesResponse() throws Exception {
- sender.sendMailjet("fake recipient", "fake sender", mockClient);
- Mockito.verify(mockClient).post(Matchers.anyObject());
- }
-}
diff --git a/compute/sendgrid/README.md b/compute/sendgrid/README.md
deleted file mode 100644
index 7a9c16aa53c..00000000000
--- a/compute/sendgrid/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Java SendGrid Email Sample for Google Compute Engine
-
-This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on
-[Google Compute Engine](https://cloud.google.com/compute/)
-
-See the [sample application documentaion][sample-docs] for more detailed
-instructions.
-
-For more information about SendGrid, see their
-[documentation](https://sendgrid.com/docs/User_Guide/index.html).
-
-[sample-docs]: https://cloud.google.com/compute/docs/tutorials/sending-mail/using-sendgrid
-
-## Running on Compute Engine
-
-To run the sample, you will need to do the following:
-
-1. [Create a SendGrid Account](http://sendgrid.com/partner/google). As of
- September 2015, Google users start with 25,000 free emails per month.
-1. Create a compute instance on the Google Cloud Platform Developer's Console
-1. SSH into the instance you created
-1. Update packages and install required packages
- sudo apt-get update && sudo apt-get install git-core openjdk-8-jdk maven
-1. Clone the repo
- git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
-1. Configure your SendGrid settings in the java class (SENDGRID_API_KEY, SENDGRID_SENDER, TO_EMAIL)
- java-docs-samples/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
-1. Navigate back to ./sendgrid and use maven to package the class as a jar
- mvn clean package
-1. Switch to the target directory with the jar file and enable execution on that file
- chmod +x compute-sendgrid-1.0-SNAPSHOT-jar-with-dependencies.jar
-1. Make sure that openjdk 8 is the selected java version
- sudo update-alternatives --config java
-1. Execute the jar file and send an email (make sure you are in the target folder)
- java -jar compute-sendgrid-1.0-SNAPSHOT-jar-with-dependencies.jar
-
diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml
deleted file mode 100644
index 7c36e821d0a..00000000000
--- a/compute/sendgrid/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- jar
- 1.0-SNAPSHOT
- com.example.compute
- compute-sendgrid
-
-
-
-
- com.sendgrid
- sendgrid-java
- 2.2.2
-
-
-
-
-
-
- maven-assembly-plugin
-
-
- package
-
- single
-
-
-
-
-
-
- com.example.compute.sendgrid.SendEmailServlet
-
-
-
- jar-with-dependencies
-
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
-
-
diff --git a/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java b/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
deleted file mode 100644
index 6c98fd8d8cb..00000000000
--- a/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.compute.sendgrid;
-
-import com.sendgrid.SendGrid;
-import com.sendgrid.SendGridException;
-
-// [START example]
-public class SendEmailServlet {
- final static String SENDGRID_API_KEY = "YOUR-SENDGRID-API-KEY";
- final static String SENDGRID_SENDER = "YOUR-SENDGRID-FROM-EMAIL";
- final static String TO_EMAIL = "DESTINATION-EMAIL";
-
- public static void main(String[] args) throws SendGridException {
-
- SendGrid sendgrid = new SendGrid(SENDGRID_API_KEY);
- SendGrid.Email email = new SendGrid.Email();
- email.addTo(TO_EMAIL);
- email.setFrom(SENDGRID_SENDER);
- email.setSubject("This is a test email");
- email.setText("Example text body.");
-
- SendGrid.Response response = sendgrid.send(email);
- if (response.getCode() != 200) {
- System.out.print(String.format("An error occured: %s", response.getMessage()));
- return;
- }
- System.out.print("Email sent.");
- }
-
-}
-// [END example]
diff --git a/datastore/README.md b/datastore/README.md
deleted file mode 100644
index a43ad13237d..00000000000
--- a/datastore/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Datastore Samples
-
-This directory contains sample code used in Google Cloud Datastore documentation. Included here is a sample command line application, `TaskList`, that interacts with Datastore to manage a to-do list.
-
-## Run the `TaskList` sample application.
-
-1. Ensure that you have:
- * Created a Google Developers Console project with the Datastore API enabled. Follow [these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up.
- * Installed the Google Cloud SDK and run the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
- * Installed [Maven](https://maven.apache.org/) and Java 7 (or above).
-
-2. Compile the program by typing `mvn clean compile` in command line.
-
-3. Run the program by typing `mvn exec:java` in command line. In addition to listing tasks via this command line interface, you can view tasks you create in the [Google Cloud Developer's Console](https://console.cloud.google.com/).
diff --git a/datastore/pom.xml b/datastore/pom.xml
deleted file mode 100644
index 2691bec11f1..00000000000
--- a/datastore/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
- 4.0.0
- com.google.datastore.snippets
- datastore-snippets
- 1.0
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ..
-
-
- jar
- Google Cloud Datastore Snippets
-
- Example snippets for Datastore concepts and getting started documentation.
-
-
-
- com.google.cloud
- gcloud-java-datastore
- 0.2.7
-
-
- junit
- junit
- 4.12
-
- compile
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.5.1
-
- 1.7
- 1.7
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.4.0
-
- com.google.datastore.snippets.TaskList
-
-
-
-
-
-
diff --git a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java
deleted file mode 100644
index 2a666b26a9e..00000000000
--- a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.datastore.snippets;
-
-import static java.util.Calendar.DECEMBER;
-import static java.util.Calendar.JANUARY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.google.cloud.datastore.Cursor;
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreException;
-import com.google.cloud.datastore.DateTime;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.EntityQuery;
-import com.google.cloud.datastore.FullEntity;
-import com.google.cloud.datastore.IncompleteKey;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.KeyFactory;
-import com.google.cloud.datastore.PathElement;
-import com.google.cloud.datastore.ProjectionEntity;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.Query.ResultType;
-import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.ReadOption;
-import com.google.cloud.datastore.StringValue;
-import com.google.cloud.datastore.StructuredQuery;
-import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
-import com.google.cloud.datastore.StructuredQuery.OrderBy;
-import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
-import com.google.cloud.datastore.Transaction;
-import com.google.cloud.datastore.testing.LocalDatastoreHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-/**
- * Contains Cloud Datastore snippets linked from the Concepts documentation.
- *
- * @see Key Datastore Concepts
- */
-public class Concepts {
-
- private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
- private static final FullEntity TEST_FULL_ENTITY = FullEntity.builder().build();
-
- private Datastore datastore;
- private KeyFactory keyFactory;
- private Key taskKey;
- private Entity testEntity;
- private DateTime startDate;
- private DateTime endDate;
- private DateTime includedDate;
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- /**
- * Starts the local Datastore emulator.
- *
- * @throws IOException if there are errors starting the local Datastore
- * @throws InterruptedException if there are errors starting the local Datastore
- */
- @BeforeClass
- public static void beforeClass() throws IOException, InterruptedException {
- HELPER.start();
- }
-
- /**
- * Initializes Datastore and cleans out any residual values. Also initializes global variables
- * used for testing.
- */
- @Before
- public void setUp() {
- datastore = HELPER.options().toBuilder().namespace("ghijklmnop").build().service();
- StructuredQuery query = Query.keyQueryBuilder().build();
- QueryResults result = datastore.run(query);
- datastore.delete(Iterators.toArray(result, Key.class));
- keyFactory = datastore.newKeyFactory().kind("Task");
- taskKey = keyFactory.newKey("some-arbitrary-key");
- testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build();
- Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- calendar.set(1990, JANUARY, 1);
- startDate = DateTime.copyFrom(calendar);
- calendar.set(2000, JANUARY, 1);
- endDate = DateTime.copyFrom(calendar);
- calendar.set(1999, DECEMBER, 31);
- includedDate = DateTime.copyFrom(calendar);
- }
-
- /**
- * Stops the local Datastore emulator.
- *
- * @throws IOException if there are errors stopping the local Datastore
- * @throws InterruptedException if there are errors stopping the local Datastore
- */
- @AfterClass
- public static void afterClass() throws IOException, InterruptedException {
- HELPER.stop();
- }
-
- private void assertValidKey(Key taskKey) {
- datastore.put(Entity.builder(taskKey, TEST_FULL_ENTITY).build());
- }
-
- @Test
- public void testIncompleteKey() {
- // [START incomplete_key]
- KeyFactory keyFactory = datastore.newKeyFactory().kind("Task");
- Key taskKey = datastore.allocateId(keyFactory.newKey());
- // [END incomplete_key]
- assertValidKey(taskKey);
- }
-
- @Test
- public void testNamedKey() {
- // [START named_key]
- Key taskKey = datastore.newKeyFactory().kind("Task").newKey("sampleTask");
- // [END named_key]
- assertValidKey(taskKey);
- }
-
- @Test
- public void testKeyWithParent() {
- // [START key_with_parent]
- Key taskKey = datastore.newKeyFactory()
- .ancestors(PathElement.of("TaskList", "default"))
- .kind("Task")
- .newKey("sampleTask");
- // [END key_with_parent]
- assertValidKey(taskKey);
- }
-
- @Test
- public void testKeyWithMultilevelParent() {
- // [START key_with_multilevel_parent]
- KeyFactory keyFactory = datastore.newKeyFactory()
- .ancestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
- .kind("Task");
- Key taskKey = keyFactory.newKey("sampleTask");
- // [END key_with_multilevel_parent]
- assertValidKey(taskKey);
- }
-
- private void assertValidEntity(Entity original) {
- datastore.put(original);
- assertEquals(original, datastore.get(original.key()));
- }
-
- @Test
- public void testEntityWithParent() {
- // [START entity_with_parent]
- Key taskKey = datastore.newKeyFactory()
- .ancestors(PathElement.of("TaskList", "default"))
- .kind("Task")
- .newKey("sampleTask");
- Entity task = Entity.builder(taskKey)
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 4)
- .set("description", "Learn Cloud Datastore")
- .build();
- // [END entity_with_parent]
- assertValidEntity(task);
- }
-
- @Test
- public void testProperties() {
- // [START properties]
- Entity task = Entity.builder(taskKey)
- .set("type", "Personal")
- .set("created", DateTime.now())
- .set("done", false)
- .set("priority", 4)
- .set("percent_complete", 10.0)
- .set("description",
- StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build())
- .build();
- // [END properties]
- assertValidEntity(task);
- }
-
- @Test
- public void testArrayValue() {
- // [START array_value]
- Entity task = Entity.builder(taskKey)
- .set("tags", "fun", "programming")
- .set("collaborators", "alice", "bob")
- .build();
- // [END array_value]
- assertValidEntity(task);
- }
-
- @Test
- public void testBasicEntity() {
- // [START basic_entity]
- Entity task = Entity.builder(taskKey)
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 4)
- .set("description", "Learn Cloud Datastore")
- .build();
- // [END basic_entity]
- assertValidEntity(task);
- }
-
- @Test
- public void testUpsert() {
- // [START upsert]
- Entity task = Entity.builder(keyFactory.newKey("sampleTask")).build();
- datastore.put(task);
- // [END upsert]
- assertEquals(task, datastore.get(task.key()));
- }
-
- @Test
- public void testInsert() {
- // [START insert]
- Key taskKey = datastore.add(FullEntity.builder(keyFactory.newKey()).build()).key();
- // [END insert]
- assertEquals(FullEntity.builder(taskKey).build(), datastore.get(taskKey));
- }
-
- @Test
- public void testLookup() {
- datastore.put(testEntity);
- // [START lookup]
- Entity task = datastore.get(taskKey);
- // [END lookup]
- assertEquals(testEntity, task);
- }
-
- @Test
- public void testUpdate() {
- datastore.put(testEntity);
- // [START update]
- Entity task = Entity.builder(datastore.get(taskKey)).set("priority", 5).build();
- datastore.update(task);
- // [END update]
- assertEquals(task, datastore.get(taskKey));
- }
-
- @Test
- public void testDelete() {
- datastore.put(testEntity);
- // [START delete]
- datastore.delete(taskKey);
- // [END delete]
- assertNull(datastore.get(taskKey));
- }
-
- private List setUpBatchTests(Key taskKey1, Key taskKey2) {
- Entity task1 = Entity.builder(taskKey1)
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 4)
- .set("description", "Learn Cloud Datastore")
- .build();
- Entity task2 = Entity.builder(taskKey2)
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 5)
- .set("description", "Integrate Cloud Datastore")
- .build();
- datastore.put(task1, task2);
- return ImmutableList.of(task1, task2);
- }
-
- @Test
- public void testBatchUpsert() {
- // [START batch_upsert]
- FullEntity task1 = FullEntity.builder(keyFactory.newKey())
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 4)
- .set("description", "Learn Cloud Datastore")
- .build();
- FullEntity task2 = Entity.builder(keyFactory.newKey())
- .set("type", "Personal")
- .set("done", false)
- .set("priority", 5)
- .set("description", "Integrate Cloud Datastore")
- .build();
- List tasks = datastore.add(task1, task2);
- Key taskKey1 = tasks.get(0).key();
- Key taskKey2 = tasks.get(1).key();
- // [END batch_upsert]
- assertEquals(Entity.builder(taskKey1, task1).build(), datastore.get(taskKey1));
- assertEquals(Entity.builder(taskKey2, task2).build(), datastore.get(taskKey2));
- }
-
- @Test
- public void testBatchLookup() {
- Key taskKey1 = keyFactory.newKey(1);
- Key taskKey2 = keyFactory.newKey(2);
- List expectedTasks = setUpBatchTests(taskKey1, taskKey2);
- // [START batch_lookup]
- Iterator tasks = datastore.get(taskKey1, taskKey2);
- // [END batch_lookup]
- assertEquals(expectedTasks.get(0), tasks.next());
- assertEquals(expectedTasks.get(1), tasks.next());
- }
-
- @Test
- public void testBatchDelete() {
- Key taskKey1 = keyFactory.newKey(1);
- Key taskKey2 = keyFactory.newKey(2);
- setUpBatchTests(taskKey1, taskKey2);
- // [START batch_delete]
- datastore.delete(taskKey1, taskKey2);
- // [END batch_delete]
- assertNull(datastore.get(taskKey1));
- assertNull(datastore.get(taskKey2));
- }
-
- private void setUpQueryTests() {
- Key taskKey = datastore.newKeyFactory()
- .kind("Task")
- .ancestors(PathElement.of("TaskList", "default"))
- .newKey("someTask");
- datastore.put(Entity.builder(taskKey)
- .set("type", "Personal")
- .set("done", false)
- .set("completed", false)
- .set("priority", 4)
- .set("created", includedDate)
- .set("percent_complete", 10.0)
- .set("description",
- StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build())
- .set("tag", "fun", "l", "programming")
- .build());
- }
-
- private V assertValidQuery(Query query) {
- QueryResults results = datastore.run(query);
- V result = results.next();
- assertFalse(results.hasNext());
- return result;
- }
-
- private void assertInvalidQuery(Query query) {
- thrown.expect(DatastoreException.class);
- datastore.run(query);
- }
-
- @Test
- public void testBasicQuery() {
- setUpQueryTests();
- // [START basic_query]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(
- PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4)))
- .orderBy(OrderBy.desc("priority"))
- .build();
- // [END basic_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testRunQuery() {
- setUpQueryTests();
- Query query = Query.entityQueryBuilder().kind("Task").build();
- // [START run_query]
- QueryResults tasks = datastore.run(query);
- // [END run_query]
- assertNotNull(tasks.next());
- assertFalse(tasks.hasNext());
- }
-
- @Test
- public void testPropertyFilter() {
- setUpQueryTests();
- // [START property_filter]
- Query query =
- Query.entityQueryBuilder().kind("Task").filter(PropertyFilter.eq("done", false)).build();
- // [END property_filter]
- assertValidQuery(query);
- }
-
- @Test
- public void testCompositeFilter() {
- setUpQueryTests();
- // [START composite_filter]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(
- CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4)))
- .build();
- // [END composite_filter]
- assertValidQuery(query);
- }
-
- @Test
- public void testKeyFilter() {
- setUpQueryTests();
- // [START key_filter]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
- .build();
- // [END key_filter]
- assertValidQuery(query);
- }
-
- @Test
- public void testAscendingSort() {
- setUpQueryTests();
- // [START ascending_sort]
- Query query =
- Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build();
- // [END ascending_sort]
- assertValidQuery(query);
- }
-
- @Test
- public void testDescendingSort() {
- setUpQueryTests();
- // [START descending_sort]
- Query query =
- Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.desc("created")).build();
- // [END descending_sort]
- assertValidQuery(query);
- }
-
- @Test
- public void testMultiSort() {
- setUpQueryTests();
- // [START multi_sort]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .orderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
- .build();
- // [END multi_sort]
- assertValidQuery(query);
- }
-
- @Test
- public void testKindlessQuery() {
- Key lastSeenKey = keyFactory.newKey("a");
- setUpQueryTests();
- // [START kindless_query]
- Query query =
- Query.entityQueryBuilder().filter(PropertyFilter.gt("__key__", lastSeenKey)).build();
- // [END kindless_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testAncestorQuery() {
- setUpQueryTests();
- // [START ancestor_query]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.hasAncestor(
- datastore.newKeyFactory().kind("TaskList").newKey("default")))
- .build();
- // [END ancestor_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testProjectionQuery() {
- setUpQueryTests();
- // [START projection_query]
- Query query = Query.projectionEntityQueryBuilder()
- .kind("Task")
- .projection("priority", "percent_complete")
- .build();
- // [END projection_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testRunProjectionQuery() {
- setUpQueryTests();
- Query query = Query.projectionEntityQueryBuilder()
- .kind("Task")
- .projection("priority", "percent_complete")
- .build();
- // [START run_query_projection]
- List priorities = new LinkedList<>();
- List percentCompletes = new LinkedList<>();
- QueryResults tasks = datastore.run(query);
- while (tasks.hasNext()) {
- ProjectionEntity task = tasks.next();
- priorities.add(task.getLong("priority"));
- percentCompletes.add(task.getDouble("percent_complete"));
- }
- // [END run_query_projection]
- assertEquals(ImmutableList.of(4L), priorities);
- assertEquals(ImmutableList.of(10.0), percentCompletes);
- }
-
- @Test
- public void testKeysOnlyQuery() {
- setUpQueryTests();
- // [START keys_only_query]
- Query query = Query.keyQueryBuilder().kind("Task").build();
- // [END keys_only_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testRunKeysOnlyQuery() {
- setUpQueryTests();
- Query query = Query.keyQueryBuilder().kind("Task").build();
- // [START run_keys_only_query]
- QueryResults taskKeys = datastore.run(query);
- // [END run_keys_only_query]
- assertNotNull(taskKeys.next());
- assertFalse(taskKeys.hasNext());
- }
-
- @Test
- public void testDistinctQuery() {
- setUpQueryTests();
- // [START distinct_query]
- Query query = Query.projectionEntityQueryBuilder()
- .kind("Task")
- .projection("type", "priority")
- .distinctOn("type", "priority")
- .orderBy(OrderBy.asc("type"), OrderBy.asc("priority"))
- .build();
- // [END distinct_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testDistinctOnQuery() {
- setUpQueryTests();
- // [START distinct_on_query]
- Query query = Query.projectionEntityQueryBuilder()
- .kind("Task")
- .projection("type", "priority")
- .distinctOn("type")
- .orderBy(OrderBy.asc("type"), OrderBy.asc("priority"))
- .build();
- // [END distinct_on_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testArrayValueInequalityRange() {
- setUpQueryTests();
- // [START array_value_inequality_range]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(
- PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math")))
- .build();
- // [END array_value_inequality_range]
- QueryResults results = datastore.run(query);
- assertFalse(results.hasNext());
- }
-
- @Test
- public void testArrayValueEquality() {
- setUpQueryTests();
- // [START array_value_equality]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(
- PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming")))
- .build();
- // [END array_value_equality]
- assertValidQuery(query);
- }
-
- @Test
- public void testInequalityRange() {
- setUpQueryTests();
- // [START inequality_range]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(
- PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
- .build();
- // [END inequality_range]
- assertValidQuery(query);
- }
-
- @Test
- public void testInequalityInvalid() {
- // [START inequality_invalid]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(
- PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
- .build();
- // [END inequality_invalid]
- assertInvalidQuery(query);
- }
-
- @Test
- public void testEqualAndInequalityRange() {
- setUpQueryTests();
- // [START equal_and_inequality_range]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(CompositeFilter.and(PropertyFilter.eq("priority", 4),
- PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
- .build();
- // [END equal_and_inequality_range]
- assertValidQuery(query);
- }
-
- @Test
- public void testInequalitySort() {
- setUpQueryTests();
- // [START inequality_sort]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.gt("priority", 3))
- .orderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
- .build();
- // [END inequality_sort]
- assertValidQuery(query);
- }
-
- @Test
- public void testInequalitySortInvalidNotSame() {
- // [START inequality_sort_invalid_not_same]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.gt("priority", 3))
- .orderBy(OrderBy.asc("created"))
- .build();
- // [END inequality_sort_invalid_not_same]
- assertInvalidQuery(query);
- }
-
- @Test
- public void testInequalitySortInvalidNotFirst() {
- // [START inequality_sort_invalid_not_first]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.gt("priority", 3))
- .orderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
- .build();
- // [END inequality_sort_invalid_not_first]
- assertInvalidQuery(query);
- }
-
- @Test
- public void testLimit() {
- setUpQueryTests();
- // [START limit]
- Query query = Query.entityQueryBuilder().kind("Task").limit(5).build();
- // [END limit]
- assertValidQuery(query);
- }
-
- @Test
- public void testCursorPaging() {
- setUpQueryTests();
- datastore.put(testEntity);
- Cursor nextPageCursor = cursorPaging(1, null);
- assertNotNull(nextPageCursor);
- nextPageCursor = cursorPaging(1, nextPageCursor);
- assertNotNull(nextPageCursor);
- }
-
- private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
- // [START cursor_paging]
- EntityQuery.Builder queryBuilder = Query.entityQueryBuilder().kind("Task").limit(pageSize);
- if (pageCursor != null) {
- queryBuilder.startCursor(pageCursor);
- }
- QueryResults tasks = datastore.run(queryBuilder.build());
- while (tasks.hasNext()) {
- Entity task = tasks.next();
- // do something with the task
- }
- Cursor nextPageCursor = tasks.cursorAfter();
- // [END cursor_paging]
- return nextPageCursor;
- }
-
- @Test
- public void testEventualConsistentQuery() {
- setUpQueryTests();
- // [START eventual_consistent_query]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.hasAncestor(
- datastore.newKeyFactory().kind("TaskList").newKey("default")))
- .build();
- datastore.run(query, ReadOption.eventualConsistency());
- // [END eventual_consistent_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testUnindexedPropertyQuery() {
- setUpQueryTests();
- // [START unindexed_property_query]
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.eq("description", "A task description"))
- .build();
- // [END unindexed_property_query]
- QueryResults results = datastore.run(query);
- assertFalse(results.hasNext());
- }
-
- @Test
- public void testExplodingProperties() {
- // [START exploding_properties]
- Entity task = Entity.builder(taskKey)
- .set("tags", "fun", "programming", "learn")
- .set("collaborators", "alice", "bob", "charlie")
- .set("created", DateTime.now())
- .build();
- // [END exploding_properties]
- assertValidEntity(task);
- }
-
- private List setUpTransferTests() {
- KeyFactory keyFactory = datastore.newKeyFactory().kind("People");
- Key from = keyFactory.newKey("from");
- Key to = keyFactory.newKey("to");
- datastore.put(Entity.builder(from).set("balance", 100).build());
- datastore.put(Entity.builder(to).set("balance", 0).build());
- return ImmutableList.of(from, to);
- }
-
- private void assertSuccessfulTransfer(Key from, Key to) {
- assertEquals(90, datastore.get(from).getLong("balance"));
- assertEquals(10, datastore.get(to).getLong("balance"));
- }
-
- @Test
- public void testTransactionalUpdate() {
- List keys = setUpTransferTests();
- transferFunds(keys.get(0), keys.get(1), 10);
- assertSuccessfulTransfer(keys.get(0), keys.get(1));
- }
-
- // [START transactional_update]
- void transferFunds(Key fromKey, Key toKey, long amount) {
- Transaction txn = datastore.newTransaction();
- try {
- List entities = txn.fetch(fromKey, toKey);
- Entity from = entities.get(0);
- Entity updatedFrom =
- Entity.builder(from).set("balance", from.getLong("balance") - amount).build();
- Entity to = entities.get(1);
- Entity updatedTo = Entity.builder(to).set("balance", to.getLong("balance") + amount).build();
- txn.put(updatedFrom, updatedTo);
- txn.commit();
- } finally {
- if (txn.active()) {
- txn.rollback();
- }
- }
- }
- // [END transactional_update]
-
- @Test
- public void testTransactionalRetry() {
- List keys = setUpTransferTests();
- Key fromKey = keys.get(0);
- Key toKey = keys.get(1);
- // [START transactional_retry]
- int retries = 5;
- while (true) {
- try {
- transferFunds(fromKey, toKey, 10);
- break;
- } catch (DatastoreException e) {
- if (retries == 0) {
- throw e;
- }
- --retries;
- }
- }
- // Retry handling can also be configured and automatically applied using gcloud-java.
- // [END transactional_retry]
- assertSuccessfulTransfer(keys.get(0), keys.get(1));
- }
-
- @Test
- public void testTransactionalGetOrCreate() {
- // [START transactional_get_or_create]
- Entity task;
- Transaction txn = datastore.newTransaction();
- try {
- task = txn.get(taskKey);
- if (task == null) {
- task = Entity.builder(taskKey).build();
- txn.put(task);
- txn.commit();
- }
- } finally {
- if (txn.active()) {
- txn.rollback();
- }
- }
- // [END transactional_get_or_create]
- assertEquals(task, datastore.get(taskKey));
- }
-
- @Test
- public void testTransactionalSingleEntityGroupReadOnly() {
- setUpQueryTests();
- Key taskListKey = datastore.newKeyFactory().kind("TaskList").newKey("default");
- Entity taskListEntity = Entity.builder(taskListKey).build();
- datastore.put(taskListEntity);
- // [START transactional_single_entity_group_read_only]
- Entity taskList;
- QueryResults tasks;
- Transaction txn = datastore.newTransaction();
- try {
- taskList = txn.get(taskListKey);
- Query query = Query.entityQueryBuilder()
- .kind("Task")
- .filter(PropertyFilter.hasAncestor(taskListKey))
- .build();
- tasks = txn.run(query);
- txn.commit();
- } finally {
- if (txn.active()) {
- txn.rollback();
- }
- }
- // [END transactional_single_entity_group_read_only]
- assertEquals(taskListEntity, taskList);
- assertNotNull(tasks.next());
- assertFalse(tasks.hasNext());
- }
-
- @Test
- public void testNamespaceRunQuery() {
- setUpQueryTests();
- // [START namespace_run_query]
- KeyFactory keyFactory = datastore.newKeyFactory().kind("__namespace__");
- Key startNamespace = keyFactory.newKey("g");
- Key endNamespace = keyFactory.newKey("h");
- Query query = Query.keyQueryBuilder()
- .kind("__namespace__")
- .filter(CompositeFilter.and(
- PropertyFilter.gt("__key__", startNamespace),
- PropertyFilter.lt("__key__", endNamespace)))
- .build();
- List namespaces = new ArrayList<>();
- QueryResults results = datastore.run(query);
- while (results.hasNext()) {
- namespaces.add(results.next().name());
- }
- // [END namespace_run_query]
- assertEquals(ImmutableList.of("ghijklmnop"), namespaces);
- }
-
- @Test
- public void testKindRunQuery() {
- setUpQueryTests();
- // [START kind_run_query]
- Query query = Query.keyQueryBuilder().kind("__kind__").build();
- List kinds = new ArrayList<>();
- QueryResults results = datastore.run(query);
- while (results.hasNext()) {
- kinds.add(results.next().name());
- }
- // [END kind_run_query]
- assertEquals(ImmutableList.of("Task"), kinds);
- }
-
- @Test
- public void testPropertyRunQuery() {
- setUpQueryTests();
- // [START property_run_query]
- Query query = Query.keyQueryBuilder().kind("__property__").build();
- QueryResults keys = datastore.run(query);
- Map> propertiesByKind = new HashMap<>();
- while (keys.hasNext()) {
- Key key = keys.next();
- String kind = key.parent().name();
- String propertyName = key.name();
- Collection properties = propertiesByKind.get(kind);
- if (properties == null) {
- properties = new HashSet<>();
- propertiesByKind.put(kind, properties);
- }
- properties.add(propertyName);
- }
- // [END property_run_query]
- Map> expected = ImmutableMap.of("Task", ImmutableSet.of(
- "done", "type", "done", "completed", "priority", "created", "percent_complete", "tag"));
- assertEquals(expected, propertiesByKind);
- }
-
- @Test
- public void testPropertyByKindRunQuery() {
- setUpQueryTests();
- // [START property_by_kind_run_query]
- Key key = datastore.newKeyFactory().kind("__kind__").newKey("Task");
- Query query = Query.entityQueryBuilder()
- .kind("__property__")
- .filter(PropertyFilter.hasAncestor(key))
- .build();
- QueryResults results = datastore.run(query);
- Map> representationsByProperty = new HashMap<>();
- while (results.hasNext()) {
- Entity result = results.next();
- String propertyName = result.key().name();
- List representations = result.getList("property_representation");
- Collection currentRepresentations = representationsByProperty.get(propertyName);
- if (currentRepresentations == null) {
- currentRepresentations = new HashSet<>();
- representationsByProperty.put(propertyName, currentRepresentations);
- }
- for (StringValue value : representations) {
- currentRepresentations.add(value.get());
- }
- }
- // [END property_by_kind_run_query]
- Map> expected = ImmutableMap.>builder()
- .put("type", Collections.singleton("STRING"))
- .put("done", Collections.singleton("BOOLEAN"))
- .put("completed", Collections.singleton("BOOLEAN"))
- .put("priority", Collections.singleton("INT64"))
- .put("created", Collections.singleton("INT64"))
- .put("percent_complete", Collections.singleton("DOUBLE"))
- .put("tag", Collections.singleton("STRING"))
- .build();
- assertEquals(expected, representationsByProperty);
- }
-
- @Test
- public void testPropertyFilteringRunQuery() {
- setUpQueryTests();
- // [START property_filtering_run_query]
- Key startKey = datastore.newKeyFactory()
- .kind("__property__")
- .ancestors(PathElement.of("__kind__", "Task"))
- .newKey("priority");
- Query query = Query.keyQueryBuilder()
- .kind("__property__")
- .filter(PropertyFilter.ge("__key__", startKey))
- .build();
- Map> propertiesByKind = new HashMap<>();
- QueryResults keys = datastore.run(query);
- while (keys.hasNext()) {
- Key key = keys.next();
- String kind = key.parent().name();
- String propertyName = key.name();
- Collection properties = propertiesByKind.get(kind);
- if (properties == null) {
- properties = new HashSet();
- propertiesByKind.put(kind, properties);
- }
- properties.add(propertyName);
- }
- // [END property_filtering_run_query]
- Map> expected =
- ImmutableMap.of("Task", ImmutableSet.of("priority", "tag", "type"));
- assertEquals(expected, propertiesByKind);
- }
-
- @Test
- public void testGqlRunQuery() {
- setUpQueryTests();
- // [START gql_run_query]
- Query query =
- Query.gqlQueryBuilder(ResultType.ENTITY, "select * from Task order by created asc").build();
- // [END gql_run_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testGqlNamedBindingQuery() {
- setUpQueryTests();
- // [START gql_named_binding_query]
- Query query =
- Query.gqlQueryBuilder(
- ResultType.ENTITY,
- "select * from Task where completed = @completed and priority = @priority")
- .setBinding("completed", false)
- .setBinding("priority", 4)
- .build();
- // [END gql_named_binding_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testGqlPositionalBindingQuery() {
- setUpQueryTests();
- // [START gql_positional_binding_query]
- Query query = Query.gqlQueryBuilder(
- ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2")
- .addBinding(false)
- .addBinding(4)
- .build();
- // [END gql_positional_binding_query]
- assertValidQuery(query);
- }
-
- @Test
- public void testGqlLiteralQuery() {
- setUpQueryTests();
- // [START gql_literal_query]
- Query query = Query.gqlQueryBuilder(
- ResultType.ENTITY, "select * from Task where completed = false and priority = 4")
- .allowLiteral(true)
- .build();
- // [END gql_literal_query]
- assertValidQuery(query);
- }
-}
diff --git a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
deleted file mode 100644
index 8ff5b53059a..00000000000
--- a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.datastore.snippets;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.DateTime;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.KeyFactory;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.StringValue;
-import com.google.cloud.datastore.StructuredQuery.OrderBy;
-import com.google.cloud.datastore.Transaction;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A simple Task List application demonstrating how to connect to Cloud Datastore, create, modify,
- * delete, and query entities.
- */
-public class TaskList {
-
- // [START build_service]
- // Create an authorized Datastore service using Application Default Credentials.
- private final Datastore datastore = DatastoreOptions.defaultInstance().service();
-
- // Create a Key factory to construct keys associated with this project.
- private final KeyFactory keyFactory = datastore.newKeyFactory().kind("Task");
- // [END build_service]
-
- // [START add_entity]
- /**
- * Adds a task entity to the Datastore.
- *
- * @param description The task description
- * @return The {@link Key} of the entity
- * @throws DatastoreException if the ID allocation or put fails
- */
- Key addTask(String description) {
- Key key = datastore.allocateId(keyFactory.newKey());
- Entity task = Entity.builder(key)
- .set("description", StringValue.builder(description).excludeFromIndexes(true).build())
- .set("created", DateTime.now())
- .set("done", false)
- .build();
- datastore.put(task);
- return key;
- }
- // [END add_entity]
-
- // [START update_entity]
- /**
- * Marks a task entity as done.
- *
- * @param id The ID of the task entity as given by {@link Key#id()}
- * @return true if the task was found, false if not
- * @throws DatastoreException if the transaction fails
- */
- boolean markDone(long id) {
- Transaction transaction = datastore.newTransaction();
- try {
- Entity task = transaction.get(keyFactory.newKey(id));
- if (task != null) {
- transaction.put(Entity.builder(task).set("done", true).build());
- }
- transaction.commit();
- return task != null;
- } finally {
- if (transaction.active()) {
- transaction.rollback();
- }
- }
- }
- // [END update_entity]
-
- // [START retrieve_entities]
- /**
- * Returns a list of all task entities in ascending order of creation time.
- *
- * @throws DatastoreException if the query fails
- */
- Iterator listTasks() {
- Query query =
- Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build();
- return datastore.run(query);
- }
- // [END retrieve_entities]
-
- // [START delete_entity]
- /**
- * Deletes a task entity.
- *
- * @param id The ID of the task entity as given by {@link Key#id()}
- * @throws DatastoreException if the delete fails
- */
- void deleteTask(long id) {
- datastore.delete(keyFactory.newKey(id));
- }
- // [END delete_entity]
-
- // [START format_results]
- /**
- * Converts a list of task entities to a list of formatted task strings.
- *
- * @param tasks An iterator over task entities
- * @return A list of tasks strings, one per entity
- */
- static List formatTasks(Iterator tasks) {
- List strings = new ArrayList<>();
- while (tasks.hasNext()) {
- Entity task = tasks.next();
- if (task.getBoolean("done")) {
- strings.add(
- String.format("%d : %s (done)", task.key().id(), task.getString("description")));
- } else {
- strings.add(String.format("%d : %s (created %s)", task.key().id(),
- task.getString("description"), task.getDateTime("created")));
- }
- }
- return strings;
- }
- // [END format_results]
-
- /**
- * Handles a single command.
- *
- * @param commandLine A line of input provided by the user
- */
- void handleCommandLine(String commandLine) {
- String[] args = commandLine.split("\\s+");
-
- if (args.length < 1) {
- throw new IllegalArgumentException("not enough args");
- }
-
- String command = args[0];
- switch (command) {
- case "new":
- // Everything after the first whitespace token is interpreted to be the description.
- args = commandLine.split("\\s+", 2);
- if (args.length != 2) {
- throw new IllegalArgumentException("missing description");
- }
- // Set created to now() and done to false.
- addTask(args[1]);
- System.out.println("task added");
- break;
- case "done":
- assertArgsLength(args, 2);
- long id = Long.parseLong(args[1]);
- if (markDone(id)) {
- System.out.println("task marked done");
- } else {
- System.out.printf("did not find a Task entity with ID %d%n", id);
- }
- break;
- case "list":
- assertArgsLength(args, 1);
- List tasks = formatTasks(listTasks());
- System.out.printf("found %d tasks:%n", tasks.size());
- System.out.println("task ID : description");
- System.out.println("---------------------");
- for (String taskString : tasks) {
- System.out.println(taskString);
- }
- break;
- case "delete":
- assertArgsLength(args, 2);
- deleteTask(Long.parseLong(args[1]));
- System.out.println("task deleted (if it existed)");
- break;
- default:
- throw new IllegalArgumentException("unrecognized command: " + command);
- }
- }
-
- private void assertArgsLength(String[] args, int expectedLength) {
- if (args.length != expectedLength) {
- throw new IllegalArgumentException(
- String.format("expected exactly %d arg(s), found %d", expectedLength, args.length));
- }
- }
-
- /**
- * Exercises the methods defined in this class.
- *
- *
Assumes that you are authenticated using the Google Cloud SDK (using
- * {@code gcloud auth login}).
- */
- public static void main(String[] args) throws Exception {
- TaskList taskList = new TaskList();
- System.out.println("Cloud Datastore Task List");
- System.out.println();
- printUsage();
- while (true) {
- String commandLine = System.console().readLine("> ");
- if (commandLine.trim().isEmpty()) {
- break;
- }
- try {
- taskList.handleCommandLine(commandLine);
- } catch (IllegalArgumentException e) {
- System.out.println(e.getMessage());
- printUsage();
- }
- }
- System.out.println("exiting");
- System.exit(0);
- }
-
- private static void printUsage() {
- System.out.println("Usage:");
- System.out.println();
- System.out.println(" new Adds a task with a description ");
- System.out.println(" done Marks a task as done");
- System.out.println(" list Lists all tasks by creation time");
- System.out.println(" delete Deletes a task");
- System.out.println();
- }
-}
diff --git a/java-repo-tools/.gitignore b/java-repo-tools/.gitignore
deleted file mode 100644
index 342c18bf686..00000000000
--- a/java-repo-tools/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-service-account.json
-
-### Java ###
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Maven
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
diff --git a/java-repo-tools/.travis.yml b/java-repo-tools/.travis.yml
deleted file mode 100644
index d5659c59ce8..00000000000
--- a/java-repo-tools/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-language: java
-jdk:
-- oraclejdk7
-- oraclejdk8
-script: mvn verify
-after_success:
-- bash <(curl -s https://codecov.io/bash)
-branches:
- only:
- - master
diff --git a/java-repo-tools/CONTRIBUTING.md b/java-repo-tools/CONTRIBUTING.md
deleted file mode 100644
index 6736efd943c..00000000000
--- a/java-repo-tools/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
-
- * If you are an individual writing original source code and you're sure you
- own the intellectual property, then you'll need to sign an [individual CLA]
- (https://developers.google.com/open-source/cla/individual).
- * If you work for a company that wants to allow you to contribute your work,
- then you'll need to sign a [corporate CLA]
- (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
- Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
- you are contributing. Refer to the
- [Google Cloud Platform Samples Style Guide]
- (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
- recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
diff --git a/java-repo-tools/LICENSE b/java-repo-tools/LICENSE
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/java-repo-tools/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/java-repo-tools/README.md b/java-repo-tools/README.md
deleted file mode 100644
index 0c172c9c051..00000000000
--- a/java-repo-tools/README.md
+++ /dev/null
@@ -1,160 +0,0 @@
-# Cloud Platform Java Repository Tools
-
-[](https://travis-ci.org/GoogleCloudPlatform/java-repo-tools)
-[](https://codecov.io/gh/GoogleCloudPlatform/java-repo-tools)
-
-This is a collection of common tools used to maintain and test Java repositories
-in the [GoogleCloudPlaftorm](https://github.com/GoogleCloudPlatform)
-organization.
-
-
-## Using this repository
-
-This repository is copied into a subtree of other Java repositories, such as
-[java-docs-samples](/GoogleCloudPlatform/java-docs-samples). Note, that a
-subtree is just the code copied into a directory, so a regular `git clone` will
-continue to work.
-
-
-### Adding to a new repository
-
-To copy `java-repo-tools` into a subtree of a new repository `my-java-samples`,
-first add this repository as a remote. We then fetch all the changes from this
-`java-repo-tools`.
-
-```
-git remote add java-repo-tools git@github.com:GoogleCloudPlatform/java-repo-tools.git
-git fetch java-repo-tools master
-```
-
-We can then go back to the `my-java-samples` code and prepare a Pull Request to
-add the `java-repo-tools` code in a subtree. Making a new branch is optional, but
-recommended so that you can more easily send a pull request to start using
-`java-repo-tools`.
-
-```
-git checkout -b use-java-repo-tools origin/master
-```
-
-Finally, read the `java-repo-tools` into a subtree. So that you can pull future
-updates from the `java-repo-tools` repository, this command will merge histories.
-This way prevents unnecessary conflicts when pulling changes in.
-
-```
-git subtree add --prefix=java-repo-tools java-repo-tools master
-```
-
-Now all the content of `java-repo-tools` will be in the `java-repo-tools/`
-directory (which we specified in the `--prefix` command).
-
-#### Using the Maven configuration
-
-If all the projects within your `my-java-samples` share a common parent POM for
-plugin configuration (like checkstyle). We can then make the
-`java-repo-tools/pom.xml` parent of this.
-
-```
-
-
- com.google.cloud
- shared-configuration
- 1.0.0
- java-repo-tools
-
-```
-
-Once this is added to the common parent, all modules will have the same plugin
-configuration applied. If the children POMs provide the plugin information
-themselves, it will override this configuration, so you should delete any
-now-redundant plugin information.
-
-
-#### Examples
-
-- Adding to repository with an existing parent POM: Pull Request
- [java-docs-samples#125][java-docs-samples-125].
-
-[java-docs-samples-125]: https://github.com/GoogleCloudPlatform/java-docs-samples/pull/125
-
-
-### Detecting if you need to synchronize a subtree
-
-If you haven't done this before, run
-
-```
-git remote add java-repo-tools git@github.com:GoogleCloudPlatform/java-repo-tools.git
-```
-
-To detect if you have changes in the directory, run
-
-```
-git fetch java-repo-tools master
-git diff-tree -p HEAD:java-repo-tools/ java-repo-tools/master
-```
-
-or to diff against your local `java-repo-tools` branch:
-
-```
-git diff-tree -p HEAD:java-repo-tools/ java-repo-tools --
-```
-
-(The trailing `--` is to say that we want to compare against the branch, not the
-directory.)
-
-
-### Pulling changes from Java Repository Tools to a subtree
-
-To update the `java-repo-tools` directory, if you haven't done this before, run
-
-```
-git remote add java-repo-tools git@github.com:GoogleCloudPlatform/java-repo-tools.git
-```
-
-To pull the latest changes from this `java-repo-tools` repository, run:
-
-```
-git checkout master
-# Making a new branch is optional, but recommended to send a pull request for
-# update.
-git checkout -b update-java-repo-tools
-git pull -s subtree java-repo-tools master
-```
-
-Then you can make any needed changes to make the rest of the repository
-compatible with the updated `java-repo-tools` code, commit, push, and send a
-Pull Request as you would in the normal flow.
-
-
-### Pushing changes from a subtree upstream to Java Repository Tools
-
-What if you make changes in your repository and now want to push them upstream?
-
-Assuming you just commited changes in the `java-repo-tools/` directory of your
-`my-main-branch`, to split the `java-repo-tools` changes into their own branch.
-The first time using the `subtree` command, we may need to use the `--rejoin`
-argument.
-
-```
-git subtree split --prefix=java-repo-tools -b ${USER}-push-java-repo-tools
-git checkout ${USER}-push-java-repo-tools
-git push java-repo-tools ${USER}-push-java-repo-tools
-```
-
-Then, you can send a pull request to the `java-repo-tools` repository.
-
-
-## References
-
-- [GitHub's subtree merge reference](https://help.github.com/articles/about-git-subtree-merges/)
-
-## Contributing changes
-
-- See [CONTRIBUTING.md](CONTRIBUTING.md)
-
-
-## Licensing
-
-- Apache 2.0 - See [LICENSE](LICENSE)
-
diff --git a/java-repo-tools/codecov.yml b/java-repo-tools/codecov.yml
deleted file mode 100644
index f5c84448f07..00000000000
--- a/java-repo-tools/codecov.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-codecov:
- branch: master
-comment:
- branches:
- - master
diff --git a/java-repo-tools/google-checks.xml b/java-repo-tools/google-checks.xml
deleted file mode 100644
index cf6675c5534..00000000000
--- a/java-repo-tools/google-checks.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java-repo-tools/pom.xml b/java-repo-tools/pom.xml
deleted file mode 100644
index 48490d39f6b..00000000000
--- a/java-repo-tools/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- 4.0.0
- 1.0.0
-
- com.google.cloud
- shared-configuration
- pom
-
-
- UTF-8
- UTF-8
-
-
-
- 3.1.0
-
-
-
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.19.1
-
- false
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.19.1
-
-
-
- integration-test
- verify
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 2.17
-
- google-checks.xml
- true
- true
- true
- true
- suppressions.xml
-
-
- check
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
- 2.2
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.7.6.201602180812
-
-
-
- prepare-agent
-
-
-
- report
- test
-
- report
-
-
-
-
-
-
-
diff --git a/java-repo-tools/scripts/test-localhost.sh b/java-repo-tools/scripts/test-localhost.sh
deleted file mode 100755
index 742e0df3aa8..00000000000
--- a/java-repo-tools/scripts/test-localhost.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-# Usage:
-# test-localhost.sh deployment-type path/to/project -- [maven arguments]
-#
-# This script runs a localhost server Maven plugin and verifies that a request
-# to http://localhost:8080/ does not return an error code.
-
-print_usage () {
- echo "Usage:" >&2
- echo " $0 server-type path/to/project [-- maven arguments]" >&2
- echo >&2
- echo "server-type can be any of the following:" >&2
- echo " appengine" >&2
- echo " jetty" >&2
- echo " spring-boot" >&2
-}
-
-if [[ -z "$1" ]]; then
- echo "Missing server-type parameter." >&2
- print_usage
- exit 1
-fi
-case $1 in
- appengine)
- mvn_plugin="appengine:devserver"
- server_started_message="localhost:8080"
- ;;
- jetty)
- mvn_plugin="jetty:run-exploded"
- server_started_message="Started Jetty Server"
- ;;
- spring-boot)
- mvn_plugin="spring-boot:run"
- server_started_message="Tomcat started on port(s): 8080 (http)"
- ;;
- *)
- print_usage
- exit 1
- ;;
-esac
-
-if [[ -z "$2" ]]; then
- echo "Missing directory parameter." >&2
- print_usage
- exit 1
-fi
-code_path=$2
-
-mvn_command="mvn --batch-mode clean ${mvn_plugin} -DskipTests"
-if [[ "$3" == "--" ]]; then
- shift 3
- for mvn_arg in "${@}"; do
- mvn_command="${mvn_command} ${mvn_arg}"
- done
-elif [[ -n "$3" ]]; then
- echo "Got unexpected third argument" >&2
- print_usage
- exit 1
-fi
-
-set -e
-set -x
-
-(
-cd "$code_path"
-expect -c "
- spawn ${mvn_command}
- set timeout 600
- expect \"${server_started_message}\"
- "'sleep 10
- spawn curl --silent --output /dev/stderr --write-out "%{http_code}" http://localhost:8080/
- expect {
- "200" {
- exit
- }
- }
- exit 1
- '
-)
-
diff --git a/java-repo-tools/suppressions.xml b/java-repo-tools/suppressions.xml
deleted file mode 100644
index 22a348c205e..00000000000
--- a/java-repo-tools/suppressions.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java-repo-tools/test-devserver.sh b/java-repo-tools/test-devserver.sh
deleted file mode 100755
index 62b3dfefef7..00000000000
--- a/java-repo-tools/test-devserver.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-# Usage:
-# test-devserver.sh path/to/project
-#
-# This script runs the local appengine:devserver Maven plugin and verifies that
-# a request to http://localhost:8080/ does not return an error code.
-#
-# As an example, this is useful for verifying that datastore-indexes.xml is
-# correct (only if autoGenerate=false and the / handler does all queries used),
-# as an example.
-
-set -e
-set -x
-
-if [ -z "$1" ]; then
- echo "Missing directory parameter."
- echo "Usage:"
- echo " $0 path/to/project"
- exit 1
-fi
-
-(
-cd "$1"
-expect -c '
- spawn mvn --batch-mode clean appengine:devserver -DskipTests
- set timeout 600
- expect localhost:8080
- sleep 10
- spawn curl --silent --output /dev/stderr --write-out "%{http_code}" http://localhost:8080/
- expect {
- "200" {
- exit
- }
- }
- exit 1
- '
-)
-
diff --git a/java-repo-tools/test/README.md b/java-repo-tools/test/README.md
deleted file mode 100644
index 59e4015515c..00000000000
--- a/java-repo-tools/test/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cloud Platform Java Repository Tools Test
-
-This is a test application for checking that the root [`pom.xml`](../pom.xml)
-and [`google-checks.xml`](../google-checks.xml) are working as expected.
-
diff --git a/java-repo-tools/test/pom.xml b/java-repo-tools/test/pom.xml
deleted file mode 100644
index 0bde62cec8e..00000000000
--- a/java-repo-tools/test/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- 4.0.0
-
- com.google.cloud
- shared-configuration-test
- 1.0
- jar
-
-
- shared-configuration
- com.google.cloud
- 1.0.0
- ..
-
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- com.google.truth
- truth
- 0.28
- test
-
-
-
diff --git a/java-repo-tools/test/src/main/java/com/google/cloud/samples/test/App.java b/java-repo-tools/test/src/main/java/com/google/cloud/samples/test/App.java
deleted file mode 100644
index a2e47132975..00000000000
--- a/java-repo-tools/test/src/main/java/com/google/cloud/samples/test/App.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.cloud.samples.test;
-
-/**
- * A hello world app to test the parent pom.xml.
- */
-public class App {
- public String greeting() {
- return "Hello World!";
- }
-
- public static void main(String[] args) {
- App app = new App();
- System.out.println(app.greeting());
- }
-}
diff --git a/java-repo-tools/test/src/test/java/com/google/cloud/samples/test/AppTest.java b/java-repo-tools/test/src/test/java/com/google/cloud/samples/test/AppTest.java
deleted file mode 100644
index 3bdb86fa09a..00000000000
--- a/java-repo-tools/test/src/test/java/com/google/cloud/samples/test/AppTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.cloud.samples.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * Unit tests for {@link App}.
- */
-@RunWith(JUnit4.class)
-public class AppTest {
- @Test public void main_printsHelloWorld() {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- System.setOut(new PrintStream(out));
-
- App.main(new String[0]);
-
- String greeting = out.toString();
- assertThat(greeting).named("greeting").contains("Hello World!");
- }
-}
diff --git a/language/README.md b/language/README.md
deleted file mode 100644
index 2d20460d61c..00000000000
--- a/language/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Google Cloud Natural Language API Samples
-
-These samples demonstrate the use of the [Google Cloud Natural Language API][NL-Docs].
-
-[NL-Docs]: https://cloud.google.com/language/docs/
-
-## Prerequisites
-
-### Download Maven
-
-This sample uses the [Apache Maven][maven] build system. Before getting started, be
-sure to [download][maven-download] and [install][maven-install] it. When you use
-Maven as described here, it will automatically download the needed client
-libraries.
-
-[maven]: https://maven.apache.org
-[maven-download]: https://maven.apache.org/download.cgi
-[maven-install]: https://maven.apache.org/install.html
-
-### Set Up to Authenticate With Your Project's Credentials
-
-Please follow the [Set Up Your Project](https://cloud.google.com/natural-language/docs/getting-started#set_up_your_project)
-steps in the Quickstart doc to create a project and enable the
-Cloud Natural Language API. Following those steps, make sure that you
-[Set Up a Service Account](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account),
-and export the following environment variable:
-
-```
-export GOOGLE_APPLICATION_CREDENTIALS=/path/to/your-project-credentials.json
-```
-
-[cloud-console]: https://console.cloud.google.com
-[language-api]: https://console.cloud.google.com/apis/api/language.googleapis.com/overview?project=_
-[adc]: https://cloud.google.com/docs/authentication#developer_workflow
-
-## Samples
-
-- [Analyze](analysis) is a command line tool to show case the features of the API.
-
diff --git a/language/analysis/README.md b/language/analysis/README.md
deleted file mode 100644
index f9c224faedb..00000000000
--- a/language/analysis/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Google Cloud Natural Language API Entity Recognition Sample
-
-This sample demonstrates the use of the [Google Cloud Natural Language API][NL-Docs]
-for entity recognition.
-
-[NL-Docs]: https://cloud.google.com/language/docs/
-
-## Java Version
-
-This sample requires you to have
-[Java8](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html).
-
-## Download Maven
-
-This sample uses the [Apache Maven][maven] build system. Before getting started, be
-sure to [download][maven-download] and [install][maven-install] it. When you use
-Maven as described here, it will automatically download the needed client
-libraries.
-
-[maven]: https://maven.apache.org
-[maven-download]: https://maven.apache.org/download.cgi
-[maven-install]: https://maven.apache.org/install.html
-
-## Run the sample
-
-To build the sample, we use Maven.
-
-```bash
-mvn clean compile assembly:single
-```
-
-We can then run the assembled JAR file with the `java` command. The variable $COMMAND takes
-three values `entities`, `sentiment` or `syntax`.
-
-```
-MAIN_CLASS=com.google.cloud.language.samples.Analyze
-JAR_FILE=target/entities-1.0-SNAPSHOT-jar-with-dependencies.jar
-java -cp $JAR_FILE $MAIN_CLASS
-```
-
-Example usage:
-
-```
-QUOTE="Larry Page, Google's co-founder, once described the 'perfect search
- engine' as something that 'understands exactly what you mean and gives you
- back exactly what you want.' Since he spoke those words Google has grown to
- offer products beyond search, but the spirit of what he said remains."
-
-java -cp $JAR_FILE $MAIN_CLASS entities "$QUOTE"
-java -cp $JAR_FILE $MAIN_CLASS sentiment "$QUOTE"
-java -cp $JAR_FILE $MAIN_CLASS syntax "$QUOTE"
-```
-
diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
deleted file mode 100644
index 6e186dc4464..00000000000
--- a/language/analysis/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
- 4.0.0
- jar
- 1.0-SNAPSHOT
- com.google.cloud.language.samples
- entities
-
-
-
-
- com.google.apis
- google-api-services-language
- v1beta1-rev5-1.22.0
-
-
- com.google.api-client
- google-api-client
- 1.22.0
-
-
- com.google.guava
- guava
- 19.0
-
-
-
-
-
- junit
- junit
- 4.12
-
-
- com.google.truth
- truth
- 0.29
-
-
-
-
-
- maven-assembly-plugin
-
-
-
- com.google.cloud.language.samples.entities.AnalyzeEntitiesApp
-
-
-
- jar-with-dependencies
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.18.1
-
-
-
- integration-test
- verify
-
-
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
-
-
diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
deleted file mode 100644
index 104550bad22..00000000000
--- a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.cloud.language.samples;
-
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPI;
-import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPIScopes;
-import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesRequest;
-import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesResponse;
-import com.google.api.services.language.v1beta1.model.AnalyzeSentimentRequest;
-import com.google.api.services.language.v1beta1.model.AnalyzeSentimentResponse;
-import com.google.api.services.language.v1beta1.model.AnnotateTextRequest;
-import com.google.api.services.language.v1beta1.model.AnnotateTextResponse;
-import com.google.api.services.language.v1beta1.model.Document;
-import com.google.api.services.language.v1beta1.model.Entity;
-import com.google.api.services.language.v1beta1.model.Features;
-import com.google.api.services.language.v1beta1.model.Sentiment;
-import com.google.api.services.language.v1beta1.model.Token;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.security.GeneralSecurityException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A sample application that uses the Natural Language API to perform
- * entity, sentiment and syntax analysis.
- */
-@SuppressWarnings("serial")
-public class Analyze {
- /**
- * Be sure to specify the name of your application. If the application name is {@code null} or
- * blank, the application will log a warning. Suggested format is "MyCompany-ProductName/1.0".
- */
- private static final String APPLICATION_NAME = "Google-LanguagAPISample/1.0";
-
- private static final int MAX_RESULTS = 4;
-
- /**
- * Detects entities,sentiment and syntax in a document using the Natural Language API.
- */
- public static void main(String[] args) throws IOException, GeneralSecurityException {
- if (args.length != 2) {
- System.err.println("Usage:");
- System.err.printf(
- "\tjava %s \"command\" \"text to analyze\"\n",
- Analyze.class.getCanonicalName());
- System.exit(1);
- }
- String command = args[0];
- String text = args[1];
-
- Analyze app = new Analyze(getLanguageService());
-
- if (command.equals("entities")) {
- printEntities(System.out, app.analyzeEntities(text));
- } else if (command.equals("sentiment")) {
- printSentiment(System.out, app.analyzeSentiment(text));
- } else if (command.equals("syntax")) {
- printSyntax(System.out, app.analyzeSyntax(text));
- }
- }
-
- /**
- * Print a list of {@code entities}.
- */
- public static void printEntities(PrintStream out, List entities) {
- if (entities == null || entities.size() == 0) {
- out.println("No entities found.");
- return;
- }
- out.printf("Found %d entit%s.\n", entities.size(), entities.size() == 1 ? "y" : "ies");
- for (Entity entity : entities) {
- out.printf("%s\n", entity.getName());
- out.printf("\tSalience: %.3f\n", entity.getSalience());
- out.printf("\tType: %s\n", entity.getType());
- if (entity.getMetadata() != null) {
- for (Map.Entry metadata : entity.getMetadata().entrySet()) {
- out.printf("\tMetadata: %s = %s\n", metadata.getKey(), metadata.getValue());
- }
- }
- }
- }
-
- /**
- * Print the Sentiment {@code sentiment}.
- */
- public static void printSentiment(PrintStream out, Sentiment sentiment) {
- if (sentiment == null) {
- out.println("No sentiment found");
- return;
- }
- out.println("Found sentiment.");
- out.printf("\tMagnitude: %.3f\n", sentiment.getMagnitude());
- out.printf("\tPolarity: %.3f\n", sentiment.getPolarity());
- }
-
- public static void printSyntax(PrintStream out, List tokens) {
- if (tokens == null || tokens.size() == 0) {
- out.println("No syntax found");
- return;
- }
- out.printf("Found %d token%s.\n", tokens.size(), tokens.size() == 1 ? "" : "s");
- for (Token token : tokens) {
- out.println("TextSpan");
- out.printf("\tText: %s\n", token.getText().getContent());
- out.printf("\tBeginOffset: %d\n", token.getText().getBeginOffset());
- out.printf("Lemma: %s\n", token.getLemma());
- out.printf("PartOfSpeechTag: %s\n", token.getPartOfSpeech().getTag());
- out.println("DependencyEdge");
- out.printf("\tHeadTokenIndex: %d\n", token.getDependencyEdge().getHeadTokenIndex());
- out.printf("\tLabel: %s\n", token.getDependencyEdge().getLabel());
- }
- }
-
- /**
- * Connects to the Natural Language API using Application Default Credentials.
- */
- public static CloudNaturalLanguageAPI getLanguageService()
- throws IOException, GeneralSecurityException {
- GoogleCredential credential =
- GoogleCredential.getApplicationDefault().createScoped(CloudNaturalLanguageAPIScopes.all());
- JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
- return new CloudNaturalLanguageAPI.Builder(
- GoogleNetHttpTransport.newTrustedTransport(),
- jsonFactory, new HttpRequestInitializer() {
- @Override
- public void initialize(HttpRequest request) throws IOException {
- credential.initialize(request);
- }
- })
- .setApplicationName(APPLICATION_NAME)
- .build();
- }
-
- private final CloudNaturalLanguageAPI languageApi;
-
- /**
- * Constructs a {@link Analyze} which connects to the Cloud Natural Language API.
- */
- public Analyze(CloudNaturalLanguageAPI languageApi) {
- this.languageApi = languageApi;
- }
-
- /**
- * Gets {@link Entity}s from the string {@code text}.
- */
- public List analyzeEntities(String text) throws IOException {
- AnalyzeEntitiesRequest request =
- new AnalyzeEntitiesRequest()
- .setDocument(new Document().setContent(text).setType("PLAIN_TEXT"))
- .setEncodingType("UTF16");
- CloudNaturalLanguageAPI.Documents.AnalyzeEntities analyze =
- languageApi.documents().analyzeEntities(request);
-
- AnalyzeEntitiesResponse response = analyze.execute();
- return response.getEntities();
- }
-
- /**
- * Gets {@link Sentiment} from the string {@code text}.
- */
- public Sentiment analyzeSentiment(String text) throws IOException {
- AnalyzeSentimentRequest request =
- new AnalyzeSentimentRequest()
- .setDocument(new Document().setContent(text).setType("PLAIN_TEXT"));
- CloudNaturalLanguageAPI.Documents.AnalyzeSentiment analyze =
- languageApi.documents().analyzeSentiment(request);
-
- AnalyzeSentimentResponse response = analyze.execute();
- return response.getDocumentSentiment();
- }
-
- /**
- * Gets {@link Token}s from the string {@code text}.
- */
- public List analyzeSyntax(String text) throws IOException {
- AnnotateTextRequest request =
- new AnnotateTextRequest()
- .setDocument(new Document().setContent(text).setType("PLAIN_TEXT"))
- .setFeatures(new Features().setExtractSyntax(true))
- .setEncodingType("UTF16");
- CloudNaturalLanguageAPI.Documents.AnnotateText analyze =
- languageApi.documents().annotateText(request);
-
- AnnotateTextResponse response = analyze.execute();
- return response.getTokens();
- }
-}
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
deleted file mode 100644
index adc97efe112..00000000000
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.cloud.language.samples;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.language.v1beta1.model.Entity;
-import com.google.api.services.language.v1beta1.model.Sentiment;
-import com.google.api.services.language.v1beta1.model.Token;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Integration (system) tests for {@link Analyze}.
- */
-@RunWith(JUnit4.class)
-@SuppressWarnings("checkstyle:abbreviationaswordinname")
-public class AnalyzeIT {
-
- private Analyze analyzeApp;
-
- @Before public void setup() throws Exception {
- analyzeApp = new Analyze(Analyze.getLanguageService());
- }
-
- @Test public void analyzeEntities_withEntities_returnsLarryPage() throws Exception {
- // Act
- List entities =
- analyzeApp.analyzeEntities(
- "Larry Page, Google's co-founder, once described the 'perfect search engine' as"
- + " something that 'understands exactly what you mean and gives you back exactly what"
- + " you want.' Since he spoke those words Google has grown to offer products beyond"
- + " search, but the spirit of what he said remains.");
- List got = entities.stream().map(e -> e.getName()).collect(Collectors.toList());
-
- // Assert
- assertThat(got).named("entity names").contains("Larry Page");
- }
-
- @Test public void analyzeSentiment_returnPositive() throws Exception {
- // Act
- Sentiment sentiment =
- analyzeApp.analyzeSentiment(
- "Tom Cruise is one of the finest actors in hollywood and a great star!");
-
- // Assert
- assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
- assertThat((double)sentiment.getPolarity()).isEqualTo(1.0);
- }
-
- @Test public void analyzeSentiment_returnNegative() throws Exception {
- // Act
- Sentiment sentiment =
- analyzeApp.analyzeSentiment(
- "John was seriously injured in an accident");
-
- // Assert
- assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
- assertThat((double)sentiment.getPolarity()).isEqualTo(-1.0);
- }
-
- @Test public void analyzeSyntax_partOfSpeech() throws Exception {
- // Act
- List token =
- analyzeApp.analyzeSyntax(
- "President Obama was elected for the second term");
-
- List got = token.stream().map(e -> e.getPartOfSpeech().getTag())
- .collect(Collectors.toList());
-
- // Assert
- assertThat(got).containsExactly("NOUN", "NOUN", "VERB",
- "VERB", "ADP", "DET", "ADJ", "NOUN").inOrder();
- }
-}
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
deleted file mode 100644
index e38da64af06..00000000000
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.cloud.language.samples;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.language.v1beta1.model.Entity;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * Unit tests for {@link Analyze}.
- */
-@RunWith(JUnit4.class)
-public class AnalyzeTest {
- private static final int MAX_RESULTS = 3;
-
- @Test public void printEntities_withNull_printsNoneFound() throws Exception {
- // Arrange
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(bout);
-
- // Act
- Analyze.printEntities(out, null);
-
- // Assert
- String got = bout.toString();
- assertThat(got).contains("No entities found");
- }
-
- @Test public void printEntities_withEmpty_printsNoneFound() throws Exception {
- // Arrange
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(bout);
- ImmutableList entities = ImmutableList.of();
-
- // Act
- Analyze.printEntities(out, entities);
-
- // Assert
- String got = bout.toString();
- assertThat(got).contains("No entities found");
- }
-
- @Test public void printEntities_withEntities_printsEntities() throws Exception {
- // Arrange
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(bout);
- ImmutableList entities =
- ImmutableList.of(
- new Entity().setName("Larry Page").setSalience(0.426f).setType("PERSON").setMetadata(
- ImmutableMap.builder()
- .put("knowledge_graph_mid", "/m/0gjpq")
- .put("wikipedia_url", "http://en.wikipedia.org/wiki/index.html?curid=60903")
- .build()),
- new Entity().setName("search engine").setSalience(0.188f).setType("CONSUMER_GOOD"),
- new Entity().setName("something"));
-
- // Act
- Analyze.printEntities(out, entities);
-
- // Assert
- String got = bout.toString();
- assertThat(got).contains("Found 3 entities.");
- assertThat(got).contains("Larry Page");
- assertThat(got).contains("Salience: 0.426");
- assertThat(got).contains("Type: PERSON");
- assertThat(got).contains("Metadata: knowledge_graph_mid = /m/0gjpq");
- assertThat(got)
- .contains("Metadata: wikipedia_url = http://en.wikipedia.org/wiki/index.html?curid=60903");
- assertThat(got).contains("search engine");
- assertThat(got).contains("Salience: 0.188");
- assertThat(got).contains("Type: CONSUMER_GOOD");
- assertThat(got).contains("something");
- }
-
- @Test public void printSentiment_withNull_printsNoneFound() throws Exception {
- // Arrange
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(bout);
-
- // Act
- Analyze.printSentiment(out, null);
-
- // Assert
- String got = bout.toString();
- assertThat(got).contains("No sentiment found");
- }
-
- @Test public void printSyntax_withNull_printsNoneFound() throws Exception {
- // Arrange
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(bout);
-
- // Act
- Analyze.printSyntax(out, null);
-
- // Assert
- String got = bout.toString();
- assertThat(got).contains("No syntax found");
- }
-}
diff --git a/logging/pom.xml b/logging/pom.xml
deleted file mode 100644
index 082ae74049d..00000000000
--- a/logging/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
- 4.0.0
- com.google.cloud.logging.samples
- cloud-logging-samples
- jar
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ..
-
-
-
-
- com.google.apis
- google-api-services-logging
- v1beta3-rev10-1.21.0
-
-
- com.google.oauth-client
- google-oauth-client
- ${project.oauth.version}
-
-
- com.google.http-client
- google-http-client-jackson2
- ${project.http.version}
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- ${project.oauth.version}
-
-
- junit
- junit
-
-
- com.jcabi
- jcabi-matchers
-
-
-
-
- src/main/java
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.2
-
- 5
- 5
-
-
-
-
-
-
diff --git a/logging/src/main/java/ListLogs.java b/logging/src/main/java/ListLogs.java
deleted file mode 100644
index db4252bf4e6..00000000000
--- a/logging/src/main/java/ListLogs.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright (c) 2015 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.
- */
-// [START imports]
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.client.util.Strings;
-import com.google.api.services.logging.Logging;
-import com.google.api.services.logging.LoggingScopes;
-import com.google.api.services.logging.model.ListLogsResponse;
-import com.google.api.services.logging.model.Log;
-
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Collections;
-import java.util.List;
-// [END imports]
-
-/**
- * Cloud Logging Java API sample that lists the logs available to a project.
- * Uses the v1beta3 Cloud Logging API, version 1.20.0 or later.
- * See https://cloud.google.com/logging/docs/api/libraries/.
- */
-public class ListLogs {
-
- private static final List LOGGING_SCOPES = Collections.singletonList(
- LoggingScopes.LOGGING_READ);
-
- private static final String APPLICATION_NAME = "ListLogs sample";
-
- /**
- * Returns an authorized Cloud Logging API service client that is usable
- * on Google App Engine, Google Compute Engine, workstations with the Google Cloud SDK,
- * and other computers if you install service account private credentials.
- * See https://cloud.google.com/logging/docs/api/tasks.
- */
- // [START auth]
- public static Logging getLoggingService() throws IOException {
- HttpTransport transport = new NetHttpTransport();
- JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
- GoogleCredential credential = GoogleCredential.getApplicationDefault(transport, jsonFactory);
- if (credential.createScopedRequired()) {
- credential = credential.createScoped(LOGGING_SCOPES);
- }
- Logging service = new Logging.Builder(transport, jsonFactory, credential)
- .setApplicationName(APPLICATION_NAME).build();
- return service;
- }
- // [END auth]
-
- /**
- * Lists the names of the logs visible to a project, which may require fetching multiple
- * pages of results from the Cloud Logging API. This method converts log resource names
- * ("/projects/PROJECTID/logs/SERVICENAME%2FLOGNAME") to simple log names ("SERVICENAME/LOGNAME").
- *
- * @param service The logging service client returned by getLoggingService.
- * @param projectId The project whose logs are to be listed.
- * @throws IOException If the Cloud Logging API fails because, for example, the project ID
- * doesn't exist or authorization fails.
- * See https://cloud.google.com//logging/docs/api/tasks/#java_sample_code.
- */
- // [START listlogs]
- private static void listLogs(Logging service, String projectId) throws IOException {
- final int pageSize = 3;
- final int resourcePrefixLength = ("/projects/" + projectId + "/logs/").length();
- String nextPageToken = "";
-
- do {
- ListLogsResponse response = service.projects().logs().list(projectId)
- .setPageToken(nextPageToken).setPageSize(pageSize).execute();
- if (response.isEmpty()) {
- break;
- }
- for (Log log: response.getLogs()) {
- System.out.println(URLDecoder.decode(
- log.getName().substring(resourcePrefixLength), "utf-8"));
- }
- nextPageToken = response.getNextPageToken();
- } while (!Strings.isNullOrEmpty(nextPageToken));
- System.out.println("Done.");
- }
- // [END listlogs]
-
- /**
- * Demonstrates the Cloud Logging API by listing the logs in a project.
- * @param args The project ID.
- * @throws IOException if a Cloud Logging API call fails because, say, the project ID is wrong
- * or authorization fails.
- */
- public static void main(String[] args) throws IOException {
- if (args.length != 1) {
- System.err.println(String.format("Usage: %s ",
- ListLogs.class.getSimpleName()));
- return;
- }
-
- String projectId = args[0];
- Logging service = getLoggingService();
- listLogs(service, projectId);
- }
-}
-// [END all]
diff --git a/logging/src/test/java/ListLogsTest.java b/logging/src/test/java/ListLogsTest.java
deleted file mode 100644
index 5f1bd3e26c1..00000000000
--- a/logging/src/test/java/ListLogsTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-import static com.jcabi.matchers.RegexMatchers.containsPattern;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * Tests the Cloud Logging sample.
- */
-public class ListLogsTest {
- private final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
- private final ByteArrayOutputStream stderr = new ByteArrayOutputStream();
- private static final PrintStream REAL_OUT = System.out;
- private static final PrintStream REAL_ERR = System.err;
-
- @Before
- public void setUp() {
- System.setOut(new PrintStream(stdout));
- System.setErr(new PrintStream(stderr));
- }
-
- @After
- public void tearDown() {
- System.setOut(ListLogsTest.REAL_OUT);
- System.setErr(ListLogsTest.REAL_ERR);
- }
-
- @Test
- public void testUsage() throws Exception {
- ListLogs.main(new String[] {});
- assertEquals("Usage: ListLogs \n", stderr.toString());
- }
-
- @Test
- public void testListLogs() throws Exception {
- ListLogs.main(new String[] {"cloud-samples-tests"});
- String out = stdout.toString();
- // Don't know what logs the test project will have.
- assertThat(out, containsPattern("Done\\."));
- }
-}
diff --git a/managed_vms/.gitignore b/managed_vms/.gitignore
deleted file mode 100644
index d30ea344569..00000000000
--- a/managed_vms/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-# Google App Engine generated folder
-appengine-generated/
-
-# Java
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# maven
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-
-service-account.json
-
-#eclipse
-.classpath
-.settings
-.project
diff --git a/managed_vms/CONTRIBUTING.md b/managed_vms/CONTRIBUTING.md
deleted file mode 100644
index d9365cc8f82..00000000000
--- a/managed_vms/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
-
- * If you are an individual writing original source code and you're sure you
- own the intellectual property, then you'll need to sign an [individual CLA]
- (https://developers.google.com/open-source/cla/individual).
- * If you work for a company that wants to allow you to contribute your work,
- then you'll need to sign a [corporate CLA]
- (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
- Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
- you are contributing. Refer to the
- [Google Cloud Platform Samples Style Guide]
- (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
- recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
diff --git a/managed_vms/LICENSE b/managed_vms/LICENSE
deleted file mode 100644
index 57bc88a15a0..00000000000
--- a/managed_vms/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
diff --git a/managed_vms/README.md b/managed_vms/README.md
deleted file mode 100644
index 3941b4fc74c..00000000000
--- a/managed_vms/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Google App Engine Flexible Environment Java Samples
-
-This is a repository that contains Java code samples for [Google App Engine
-flexible environment][aeflex-docs].
-
-See our other [Google Cloud Platform GitHub
-repos](https://github.com/GoogleCloudPlatform) for sample applications and
-scaffolding for other frameworks and use cases.
-
-[aeflex-docs]: https://cloud.google.com/appengine/docs/flexible/
-
-## Run Locally
-1. Install the [Google Cloud SDK](https://cloud.google.com/sdk/), including the [gcloud tool](https://cloud.google.com/sdk/gcloud/), and [gcloud app component](https://cloud.google.com/sdk/gcloud-app).
-1. Setup the gcloud tool.
-
- ```
- gcloud init
- ```
-
-1. Clone this repo.
-
- ```
- git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
- ```
-
-1. Run this project locally from the command line.
-
- ```
- mvn clean jetty:run
- ```
-
-1. Visit the application at [http://localhost:8080](http://localhost:8080).
-
-## Deploying
-
-1. Use the [Cloud Developer Console](https://console.developer.google.com) to create a project/app id. (App id and project id are identical)
-1. Setup the gcloud tool.
-
- ```
- gcloud init
- ```
-1. Use the [Admin Console](https://appengine.google.com) to view data, queues, and other App Engine specific administration tasks.
-1. Use gcloud to deploy your app.
-
- ```
- mvn clean gcloud:deploy
- ```
-
-1. Congratulations! Your application is now live at your-app-id.appspot.com
-
-## Contributing changes
-
-* See [CONTRIBUTING.md](CONTRIBUTING.md)
-
-## Licensing
-
-* See [LICENSE](LICENSE)
diff --git a/managed_vms/analytics/pom.xml b/managed_vms/analytics/pom.xml
deleted file mode 100644
index c0d359f9f32..00000000000
--- a/managed_vms/analytics/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-analytics
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.2
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/analytics/src/main/appengine/app.yaml b/managed_vms/analytics/src/main/appengine/app.yaml
deleted file mode 100644
index 94400f39805..00000000000
--- a/managed_vms/analytics/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- GA_TRACKING_ID: YOUR-GA-TRACKING-ID
-# [END env_variables]
diff --git a/managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java b/managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
deleted file mode 100644
index d7c5ed5e620..00000000000
--- a/managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.analytics;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "analytics", value = "")
-public class AnalyticsServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String trackingId = System.getenv("GA_TRACKING_ID");
- HttpClient client = HttpClientBuilder.create().build();
- URIBuilder builder = new URIBuilder();
- builder.setScheme("http").setHost("www.google-analytics.com").setPath("/collect")
- .addParameter("v", "1") // API Version.
- .addParameter("tid", trackingId) // Tracking ID / Property ID.
- // Anonymous Client Identifier. Ideally, this should be a UUID that
- // is associated with particular user, device, or browser instance.
- .addParameter("cid", "555")
- .addParameter("t", "event") // Event hit type.
- .addParameter("ec", "example") // Event category.
- .addParameter("ea", "test action"); // Event action.
- URI uri = null;
- try {
- uri = builder.build();
- } catch (URISyntaxException e) {
- throw new ServletException("Problem building URI", e);
- }
- HttpPost request = new HttpPost(uri);
- client.execute(request);
- resp.getWriter().println("Event tracked.");
- }
-}
-// [END example]
diff --git a/managed_vms/async-rest/LICENSE b/managed_vms/async-rest/LICENSE
deleted file mode 100644
index 04cb0d70775..00000000000
--- a/managed_vms/async-rest/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2013 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.
diff --git a/managed_vms/async-rest/README.md b/managed_vms/async-rest/README.md
deleted file mode 100644
index c4162700843..00000000000
--- a/managed_vms/async-rest/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# Example Web App Using Asynchronous Servlets #
-
-This web app demonstrates using asynchronous servlet techniques to reduce server resources.
-
-The code for this tutorial is here: [https://github.com/GoogleCloudPlatform/java-docs-samples/managed_vms/async-rest](https://github.com/GoogleCloudPlatform/java-docs-samples/managed_vms/async-rest).
-
-
-## Initial Setup ##
-
-First, complete the following steps:
-
-- [Create your project](https://developers.google.com/appengine/docs/managed-vms/) and have it enabled for Managed VMs.
-- Obtain an app key for the Google Places WebService API.
-- Download and install [the Beta build of the Google Cloud SDK](https://developers.google.com/cloud/sdk/#Quick_Start).
-- Install the Cloud SDK `app-engine-java` component.
-- Authenticate wth the gcloud SDK: gcloud auth login.
-- Install [Maven](http://maven.apache.org/download.cgi) if you haven't already.
-
-
-
-## Providing your Google Places API key ##
-
-You will need to edit the pom.xml file and replace YOUR_PLACES_APP_KEY with the value of your key:
-
- YOUR_PLACES_APP_KEY
-
-You then have several options of how to run it:
-
-## Running locally without the AppEngine environment ##
-
-The application does not use any AppEngine specific services, so you can run it simply on your local machine by doing:
-
- mvn jetty:run
-
-Go to http://localhost:8080 to see the webapp.
-
-
-## Running locally using Docker ##
-
-The project also can build a docker image based on the jetty9 image for [Google Container Engine](https://cloud.google.com/container-engine/).
-First uncomment the maven plugin section for docker-maven-plugin in the pom.xml.
-The WAR file is installed in the webapps directory and the resulting image can be run locally with:
-
- docker run --rm -it -p 8080:8080 jetty9-async-rest --exec -Dcom.google.appengine.demos.asyncrest.appKey=YOUR_PLACES_APP_KEY
-
-Where you replace YOUR_PLACES_APP_KEY with the key you obtained in the initial setup.
-
-
-## Deploying to the cloud as an AppEngine ManagedVM ##
-
-To automatically stage and deploy the webapp to your project in the cloud do:
-
- mvn gcloud:deploy
-
-See here for more information on the [GCloud Maven Plugin](https://github.com/GoogleCloudPlatform/gcloud-maven-plugin).
-
diff --git a/managed_vms/async-rest/pom.xml b/managed_vms/async-rest/pom.xml
deleted file mode 100644
index fbb6073c274..00000000000
--- a/managed_vms/async-rest/pom.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
- 4.0.0
- com.google.appengine.demos
- managed-vms-async-rest
- 1.0.0-SNAPSHOT
- war
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
- async-
- 9.3.7.v20160115
- 1.8
- 1.8
- YOUR_PLACES_APP_KEY
-
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- ${jetty.version}
-
-
-
- com.google.appengine.demos.asyncrest.appKey
- ${places.appkey}
-
-
-
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
- debug
- debug
- false
- remote
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- true
- false
-
-
- ${basedir}/src/main/webapp/WEB-INF
- true
- WEB-INF
-
-
-
-
-
-
-
-
-
- org.eclipse.jetty
- jetty-client
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-util-ajax
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-webapp
- ${jetty.version}
- test
-
-
- javax.servlet
- javax.servlet-api
- provided
- 3.1.0
-
-
-
diff --git a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java b/managed_vms/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
deleted file mode 100644
index 6d0541adceb..00000000000
--- a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.demos;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collections;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@SuppressWarnings("serial")
-public class DumpServlet extends HttpServlet {
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- response.setContentType("text/html");
- response.setStatus(HttpServletResponse.SC_OK);
-
- PrintWriter out = response.getWriter();
-
- out.println("
-This demo calls the Google Maps WebService API
-to find places matching each of the search criteria passed on the query
-string.
-
-
The rest API is called both synchronously and asynchronously for comparison. The time the request thread is held by the servlet is
-displayed in red for both.
-
-Using a combination of the asynchronous servlet API and an asynchronous http client, the server is able to release the
-request thread back to the thread pool (shown in green) while waiting for the response from the Google service. The thread can be reused to handle other
-requests during the wait, which greatly reduces the number of threads required and server resources.
-
-
-
-
-
-
Synchronous
-
-
-
-
-
-
-
-
-
-
-
-
Asynchronous
-
-
-
-
-
-
-
-
-
-
-
-
Effects of Synchronous Vs Asynchronous processing
-
-
-
-
-
-
-
diff --git a/managed_vms/cloudsql/.gitignore b/managed_vms/cloudsql/.gitignore
deleted file mode 100644
index ae3c1726048..00000000000
--- a/managed_vms/cloudsql/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/managed_vms/cloudsql/README.md b/managed_vms/cloudsql/README.md
deleted file mode 100644
index 2bba231a4db..00000000000
--- a/managed_vms/cloudsql/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Cloud SQL sample for Google Managed VMs
-This sample demonstrates how to use [Cloud SQL](https://cloud.google.com/sql/) on Google Managed VMs.
-
-## Setup
-Before you can run or deploy the sample, you will need to do the following:
-
-1. Create a [Second Generation Cloud SQL](https://cloud.google.com/sql/docs/create-instance) instance. You can do this from the [Cloud Console](https://console.developers.google.com) or via the [Cloud SDK](https://cloud.google.com/sdk). To create it via the SDK use the following command:
-
- $ gcloud sql instances create YOUR_INSTANCE_NAME \
- --activation-policy=ALWAYS \
- --tier=db-n1-standard-1
-
-1. Set the root password on your Cloud SQL instance:
-
- $ gcloud sql instances set-root-password YOUR_INSTANCE_NAME --password YOUR_INSTANCE_ROOT_PASSWORD
-
-1. Use the MySQL command line tools (or a management tool of your choice) to create a [new user](https://cloud.google.com/sql/docs/create-user) and [database](https://cloud.google.com/sql/docs/create-database) for your application:
-
- $ mysql -h [IP Address of database] -u root -p
- mysql> create database YOUR_DATABASE;
- mysql> create user 'YOUR_USER'@'%' identified by 'PASSWORD';
- mysql> grant all on YOUR_DATABASE.* to 'YOUR_USER'@'%';
-
-1. Set the connection string environment variable in src/main/appengine/app.yaml
-
-## Running locally
- Export local variables
- $ export SQL_URL="jdbc:mysql://google/YOUR-DB-NAME?cloudSqlInstance=YOUR-INSTANCE-NAME&socketFactory=com.google.cloud.sql.mysql.SocketFactory&user=USERNAME&password=PASSWORD"
- $ mvn clean jetty:run
-
-## Deploying
- $ mvn clean gcloud:deploy
diff --git a/managed_vms/cloudsql/pom.xml b/managed_vms/cloudsql/pom.xml
deleted file mode 100644
index 4ab8fc7c978..00000000000
--- a/managed_vms/cloudsql/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-cloudsql
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.google.cloud.sql
- mysql-socket-factory
- 1.0.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- ${maven.plugin.version}
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/cloudsql/src/main/appengine/app.yaml b/managed_vms/cloudsql/src/main/appengine/app.yaml
deleted file mode 100644
index 95fbc276f57..00000000000
--- a/managed_vms/cloudsql/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- SQL_URL: jdbc:mysql://google/YOUR-DB-NAME?cloudSqlInstance=YOUR-INSTANCE-NAME&socketFactory=com.google.cloud.sql.mysql.SocketFactory&user=USERNAME&password=PASSWORD
-# [END env_variables]
diff --git a/managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java b/managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
deleted file mode 100644
index 2cfc51bf151..00000000000
--- a/managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.cloudsql;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "cloudsql", value = "")
-public class CloudSqlServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- // store only the first two octets of a users ip address
- String userIp = req.getRemoteAddr();
- InetAddress address = InetAddress.getByName(userIp);
- if (address instanceof Inet6Address) {
- // nest indexOf calls to find the second occurrence of a character in a
- // string
- // an alternative is to use Apache Commons Lang:
- // StringUtils.ordinalIndexOf()
- userIp = userIp.substring(0, userIp.indexOf(":", userIp.indexOf(":") + 1)) + ":*:*:*:*:*:*";
- } else if (address instanceof Inet4Address) {
- userIp = userIp.substring(0, userIp.indexOf(".", userIp.indexOf(".") + 1)) + ".*.*";
- }
-
- final String createTableSql = "CREATE TABLE IF NOT EXISTS visits ( visit_id INT NOT NULL "
- + "AUTO_INCREMENT, user_ip VARCHAR(46) NOT NULL, timestamp DATETIME NOT NULL, "
- + "PRIMARY KEY (visit_id) )";
- final String createVisitSql = "INSERT INTO visits (user_ip, timestamp) VALUES (?, ?)";
- final String selectSql = "SELECT user_ip, timestamp FROM visits ORDER BY timestamp DESC "
- + "LIMIT 10";
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/plain");
- // Detect if running remotely or locally and select correct connection url
- String url = System.getenv("SQL_URL");
-
- try (Connection conn = DriverManager.getConnection(url);
- PreparedStatement statementCreateVisit = conn.prepareStatement(createVisitSql)) {
- conn.createStatement().executeUpdate(createTableSql);
- statementCreateVisit.setString(1, userIp);
- statementCreateVisit.setTimestamp(2, new Timestamp(new Date().getTime()));
- statementCreateVisit.executeUpdate();
-
- try (ResultSet rs = conn.prepareStatement(selectSql).executeQuery()) {
- out.print("Last 10 visits:\n");
- while (rs.next()) {
- String savedIp = rs.getString("user_ip");
- String timeStamp = rs.getString("timestamp");
- out.print("Time: " + timeStamp + " Addr: " + savedIp + "\n");
- }
- }
- } catch (SQLException e) {
- throw new ServletException("SQL error", e);
- }
- }
-}
-// [END example]
diff --git a/managed_vms/cloudstorage/README.md b/managed_vms/cloudstorage/README.md
deleted file mode 100644
index 64af6f8f677..00000000000
--- a/managed_vms/cloudstorage/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Cloud Storage sample for Google Managed VMs
-This sample demonstrates how to use [Cloud Storage](https://cloud.google.com/storage/) on Google Managed VMs.
-
-## Setup
-Before you can run or deploy the sample, you will need to do the following:
-
-1. Enable the Cloud Storage API in the [Google Developers Console](https://console.developers.google.com/project/_/apiui/apiview/storage/overview).
-2. Create a Cloud Storage Bucket. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk) using the following command:
-
- ```
- $ gsutil mb gs://[your-bucket-name]
- ```
-3. Set the default ACL on your bucket to public read in order to serve files directly from Cloud Storage. You can do this with the [Google Cloud SDK](https://cloud.google.com/sdk) using the following command:
-
- ```
- $ gsutil defacl set public-read gs://[your-bucket-name]
- ```
-4. Update the bucket name in `src/main/appengine/app.yaml`. This makes the bucket name an environment variable in deployment. You still need to set the environment variable when running locally, as shown below.
-
-## Running locally
- $ export BUCKET_NAME=[your-bucket-name]
- $ mvn clean jetty:run
-
-## Deploying
- $ mvn clean gcloud:deploy
diff --git a/managed_vms/cloudstorage/pom.xml b/managed_vms/cloudstorage/pom.xml
deleted file mode 100644
index db1b1d6de1a..00000000000
--- a/managed_vms/cloudstorage/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-cloudstorage
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.google.cloud
- gcloud-java-storage
- 0.2.7
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/cloudstorage/src/main/appengine/app.yaml b/managed_vms/cloudstorage/src/main/appengine/app.yaml
deleted file mode 100644
index 539cc47fbbb..00000000000
--- a/managed_vms/cloudstorage/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- BUCKET_NAME: YOUR-BUCKET-NAME
-# [END env_variables]
diff --git a/managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java b/managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
deleted file mode 100644
index fc3c39e26dc..00000000000
--- a/managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.cloudstorage;
-
-import com.google.cloud.storage.Acl;
-import com.google.cloud.storage.Blob;
-import com.google.cloud.storage.BlobInfo;
-import com.google.cloud.storage.Storage;
-import com.google.cloud.storage.StorageOptions;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "upload", value = "/upload")
-@MultipartConfig()
-public class UploadServlet extends HttpServlet {
-
- private static final String BUCKET_NAME = System.getenv("BUCKET_NAME");
- private static Storage storage = null;
-
- @Override
- public void init() {
- storage = StorageOptions.defaultInstance().service();
- }
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- final Part filePart = req.getPart("file");
- final String fileName = filePart.getSubmittedFileName();
-
- // Modify access list to allow all users with link to read file
- List acls = new ArrayList<>();
- acls.add(Acl.of(Acl.User.ofAllUsers(), Acl.Role.READER));
- // the inputstream is closed by default, so we don't need to close it here
- Blob blob =
- storage.create(
- BlobInfo.builder(BUCKET_NAME, fileName).acl(acls).build(),
- filePart.getInputStream());
-
- // return the public download link
- resp.getWriter().print(blob.mediaLink());
- }
-}
-// [END example]
diff --git a/managed_vms/cloudstorage/src/main/webapp/index.html b/managed_vms/cloudstorage/src/main/webapp/index.html
deleted file mode 100644
index 78e9c675a9b..00000000000
--- a/managed_vms/cloudstorage/src/main/webapp/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Google Managed VMs Cloud Storage Sample
-
-
Select a file to upload to your Google Cloud Storage bucket.
-
-
-
diff --git a/managed_vms/cron/README.md b/managed_vms/cron/README.md
deleted file mode 100644
index 3535287907f..00000000000
--- a/managed_vms/cron/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# App Engine Cron Service sample for Google App Engine
-This sample demonstrates how to deploy App Engine Cron Service to ping a servlet deployed in the app.
-
-## Running locally
- $ mvn jetty:run
-
-## Deploying app
- $ mvn gcloud:deploy
-
-## Deploying cron job
- $ gcloud app deploy cron.yaml
\ No newline at end of file
diff --git a/managed_vms/cron/pom.xml b/managed_vms/cron/pom.xml
deleted file mode 100644
index 5ddc7eda9e9..00000000000
--- a/managed_vms/cron/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-cron
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/cron/src/main/appengine/app.yaml b/managed_vms/cron/src/main/appengine/app.yaml
deleted file mode 100644
index 2a659160df5..00000000000
--- a/managed_vms/cron/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/cron/src/main/appengine/cron.yaml b/managed_vms/cron/src/main/appengine/cron.yaml
deleted file mode 100644
index 989f1fe8b3f..00000000000
--- a/managed_vms/cron/src/main/appengine/cron.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-cron:
- - description: sample cron job
- url: /cron
- schedule: every 1 mins
\ No newline at end of file
diff --git a/managed_vms/cron/src/main/java/com/example/managedvms/cron/CronServlet.java b/managed_vms/cron/src/main/java/com/example/managedvms/cron/CronServlet.java
deleted file mode 100644
index 770ca75b468..00000000000
--- a/managed_vms/cron/src/main/java/com/example/managedvms/cron/CronServlet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.cron;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@WebServlet(name = "cron", value = "/cron")
-@SuppressWarnings("serial")
-public class CronServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- PrintWriter out = resp.getWriter();
- out.println("Hello from cron!");
- }
-}
-// [END example]
diff --git a/managed_vms/datastore/pom.xml b/managed_vms/datastore/pom.xml
deleted file mode 100644
index ee4bb850603..00000000000
--- a/managed_vms/datastore/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-datastore
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.google.cloud
- gcloud-java-datastore
- 0.2.7
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/datastore/src/main/appengine/app.yaml b/managed_vms/datastore/src/main/appengine/app.yaml
deleted file mode 100644
index b45dd027208..00000000000
--- a/managed_vms/datastore/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-#
-
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java b/managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
deleted file mode 100644
index 37aff9d5a34..00000000000
--- a/managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.datastore;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.DateTime;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.FullEntity;
-import com.google.cloud.datastore.IncompleteKey;
-import com.google.cloud.datastore.KeyFactory;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.StructuredQuery;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "datastore", value = "")
-public class DatastoreServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- // store only the first two octets of a users ip address
- String userIp = req.getRemoteAddr();
- InetAddress address = InetAddress.getByName(userIp);
- if (address instanceof Inet6Address) {
- // nest indexOf calls to find the second occurrence of a character in a string
- // an alternative is to use Apache Commons Lang: StringUtils.ordinalIndexOf()
- userIp = userIp.substring(0, userIp.indexOf(":", userIp.indexOf(":") + 1)) + ":*:*:*:*:*:*";
- } else if (address instanceof Inet4Address) {
- userIp = userIp.substring(0, userIp.indexOf(".", userIp.indexOf(".") + 1)) + ".*.*";
- }
-
- Datastore datastore = DatastoreOptions.defaultInstance().service();
- KeyFactory keyFactory = datastore.newKeyFactory().kind("visit");
- IncompleteKey key = keyFactory.kind("visit").newKey();
-
- // Record a visit to the datastore, storing the IP and timestamp.
- FullEntity curVisit = FullEntity.builder(key)
- .set("user_ip", userIp).set("timestamp", DateTime.now()).build();
- datastore.add(curVisit);
-
- // Retrieve the last 10 visits from the datastore, ordered by timestamp.
- Query query = Query.entityQueryBuilder().kind("visit")
- .orderBy(StructuredQuery.OrderBy.desc("timestamp")).limit(10).build();
- QueryResults results = datastore.run(query);
-
- resp.setContentType("text/plain");
- PrintWriter out = resp.getWriter();
- out.print("Last 10 visits:\n");
- while (results.hasNext()) {
- Entity entity = results.next();
- out.format("Time: %s Addr: %s\n", entity.getDateTime("timestamp"),
- entity.getString("user_ip"));
- }
- }
-}
-// [END example]
diff --git a/managed_vms/disk/pom.xml b/managed_vms/disk/pom.xml
deleted file mode 100644
index b96d9579266..00000000000
--- a/managed_vms/disk/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-disk
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/disk/src/main/appengine/app.yaml b/managed_vms/disk/src/main/appengine/app.yaml
deleted file mode 100644
index 2a659160df5..00000000000
--- a/managed_vms/disk/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java b/managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
deleted file mode 100644
index 4089d0a597b..00000000000
--- a/managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.disk;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "disk", value = "")
-public class DiskServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- String instanceId =
- System.getenv().containsKey("GAE_MODULE_INSTANCE")
- ? System.getenv("GAE_MODULE_INSTANCE") : "1";
- // store only the first two octets of a users ip address
- String userIp = req.getRemoteAddr();
- InetAddress address = InetAddress.getByName(userIp);
- if (address instanceof Inet6Address) {
- // nest indexOf calls to find the second occurrence of a character in a string
- // an alternative is to use Apache Commons Lang: StringUtils.ordinalIndexOf()
- userIp = userIp.substring(0, userIp.indexOf(":", userIp.indexOf(":") + 1)) + ":*:*:*:*:*:*";
- } else if (address instanceof Inet4Address) {
- userIp = userIp.substring(0, userIp.indexOf(".", userIp.indexOf(".") + 1)) + ".*.*";
- }
- Path tmpFile = Paths.get("/tmp/seen.txt");
- Files.write(
- tmpFile,
- (userIp + "\n").getBytes(),
- StandardOpenOption.CREATE,
- StandardOpenOption.APPEND);
- StringBuffer sb = new StringBuffer();
- List strings = Files.readAllLines(tmpFile, StandardCharsets.US_ASCII);
- for (String s : strings) {
- sb.append(s + "\n");
- }
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/plain");
- out.print("Instance: " + instanceId + "\nSeen:\n" + sb.toString());
- }
-}
-// [END example]
diff --git a/managed_vms/endpoints/README.md b/managed_vms/endpoints/README.md
deleted file mode 100644
index 429f50d9691..00000000000
--- a/managed_vms/endpoints/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Google Cloud Endpoints on App Engine flexible environment
-This sample demonstrates how to use Google Cloud Endpoints on Google App Engine Flexible Environment using Java.
-
-## Running locally
- $ mvn jetty:run
-
-## Deploying
- $ mvn gcloud:deploy
diff --git a/managed_vms/endpoints/pom.xml b/managed_vms/endpoints/pom.xml
deleted file mode 100644
index 2e43b6307ef..00000000000
--- a/managed_vms/endpoints/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-endpoints
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.google.code.gson
- gson
- 2.6.2
- compile
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.111.v20160527
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.8.v20160314
-
-
-
-
diff --git a/managed_vms/endpoints/src/main/appengine/Dockerfile b/managed_vms/endpoints/src/main/appengine/Dockerfile
deleted file mode 100644
index 62ccde6e3f4..00000000000
--- a/managed_vms/endpoints/src/main/appengine/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM gcr.io/google_appengine/jetty9
-
-ADD . /app
diff --git a/managed_vms/endpoints/src/main/appengine/app.yaml b/managed_vms/endpoints/src/main/appengine/app.yaml
deleted file mode 100644
index 6d375d8db22..00000000000
--- a/managed_vms/endpoints/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-runtime: custom
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-beta_settings:
- # Enable Google Cloud Endpoints API management.
- use_endpoints_api_management: true
- # Specify the Swagger API specification.
- endpoints_swagger_spec_file: swagger.yaml
diff --git a/managed_vms/endpoints/src/main/appengine/swagger.yaml b/managed_vms/endpoints/src/main/appengine/swagger.yaml
deleted file mode 100644
index 71bac9ce62f..00000000000
--- a/managed_vms/endpoints/src/main/appengine/swagger.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-swagger: "2.0"
-info:
- description: "A simple Google Cloud Endpoints API example."
- title: "Endpoints Example"
- version: "1.0.0"
-host: "YOUR-PROJECT-ID.appspot.com"
-basePath: "/"
-consumes:
-- "application/json"
-produces:
-- "application/json"
-schemes:
-- "https"
-paths:
- "/echo":
- post:
- description: "Echo back a given message."
- operationId: "echo"
- produces:
- - "application/json"
- responses:
- 200:
- description: "Echo"
- schema:
- $ref: "#/definitions/echoMessage"
- parameters:
- - description: "Message to echo"
- in: body
- name: message
- required: true
- schema:
- $ref: "#/definitions/echoMessage"
- "/auth/info/googlejwt":
- get:
- description: "Returns the requests' authentication information."
- operationId: "auth_info_google_jwt"
- produces:
- - "application/json"
- responses:
- 200:
- description: "Authenication info."
- schema:
- $ref: "#/definitions/authInfoResponse"
- x-security:
- - google_jwt:
- audiences:
- # This must match the "aud" field in the JWT. You can add multiple
- # audiences to accept JWTs from multiple clients.
- - "echo.endpoints.sample.google.com"
- "/auth/info/googleidtoken":
- get:
- description: "Returns the requests' authentication information."
- operationId: "authInfoGoogleIdToken"
- produces:
- - "application/json"
- responses:
- 200:
- description: "Authenication info."
- schema:
- $ref: "#/definitions/authInfoResponse"
- x-security:
- - google_id_token:
- audiences:
- # Your OAuth2 client's Client ID must be added here. You can add
- # multiple client IDs to accept tokens from multiple clients.
- - "YOUR-CLIENT-ID"
-definitions:
- echoMessage:
- properties:
- message:
- type: "string"
- authInfoResponse:
- properties:
- id:
- type: "string"
- email:
- type: "string"
-# This section requires all requests to any path to require an API key.
-security:
-- api_key: []
-securityDefinitions:
- # This section configures basic authentication with an API key.
- api_key:
- type: "apiKey"
- name: "key"
- in: "query"
- # This section configures authentication using Google API Service Accounts
- # to sign a json web token. This is mostly used for server-to-server
- # communication.
- google_jwt:
- authorizationUrl: ""
- flow: "implicit"
- type: "oauth2"
- # This must match the 'iss' field in the JWT.
- x-issuer: "jwt-client.endpoints.sample.google.com"
- # Update this with your service account's email address.
- x-jwks_uri: "https://www.googleapis.com/service_accounts/v1/jwk/YOUR-SERVICE-ACCOUNT-EMAIL"
- # This section configures authentication using Google OAuth2 ID Tokens.
- # ID Tokens can be obtained using OAuth2 clients, and can be used to access
- # your API on behalf of a particular user.
- google_id_token:
- authorizationUrl: ""
- flow: "implicit"
- type: "oauth2"
- x-issuer: "accounts.google.com"
- x-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs"
diff --git a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java b/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
deleted file mode 100644
index c5bc081040c..00000000000
--- a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.endpoints;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Base64;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-/**
- * A servlet that returns authentication information.
- * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
- */
-@WebServlet("/auth/info/*")
-public class AuthInfoServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- String encodedInfo = req.getHeader("X-Endpoint-API-UserInfo");
- if (encodedInfo == null || encodedInfo == "") {
- JsonObject anon = new JsonObject();
- anon.addProperty("id", "anonymous");
- new Gson().toJson(anon, resp.getWriter());
- return;
- }
-
- try {
- byte[] authInfo = Base64.getDecoder().decode(encodedInfo);
- resp.getOutputStream().write(authInfo);
- } catch (IllegalArgumentException iae) {
- resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- JsonObject error = new JsonObject();
- error.addProperty("code", HttpServletResponse.SC_BAD_REQUEST);
- error.addProperty("message", "Could not decode auth info.");
- new Gson().toJson(error, resp.getWriter());
- }
- }
-}
diff --git a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java b/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
deleted file mode 100644
index e54da65bd43..00000000000
--- a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.endpoints;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.stream.JsonReader;
-
-/**
- * A servlet that echoes JSON message bodies.
- */
-@WebServlet("/echo")
-public class EchoServlet extends HttpServlet {
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- resp.addHeader("Content-Encoding", "application/json");
-
- Object responseBody;
- try {
- JsonReader jsonReader = new JsonReader(req.getReader());
- responseBody = new Gson().fromJson(jsonReader, Map.class);
- } catch (JsonParseException je) {
- resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- JsonObject error = new JsonObject();
- error.addProperty("code", HttpServletResponse.SC_BAD_REQUEST);
- error.addProperty("message", "Body was not valid JSON.");
- responseBody = error;
- }
-
- new Gson().toJson(responseBody, resp.getWriter());
- }
-}
diff --git a/managed_vms/extending-runtime/README.md b/managed_vms/extending-runtime/README.md
deleted file mode 100644
index 95290cfb3f9..00000000000
--- a/managed_vms/extending-runtime/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Java extending runtime sample for Google Managed VMs
-This sample demonstrates how to use custom runtime on Google Managed VMs
-## Setup
-Before you can run this sample locally, you will have to edit the and properties in the pom.xml
diff --git a/managed_vms/extending-runtime/pom.xml b/managed_vms/extending-runtime/pom.xml
deleted file mode 100644
index c6a6b017054..00000000000
--- a/managed_vms/extending-runtime/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-extendingruntime
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/extending-runtime/src/main/appengine/Dockerfile b/managed_vms/extending-runtime/src/main/appengine/Dockerfile
deleted file mode 100644
index 928d5a31b5a..00000000000
--- a/managed_vms/extending-runtime/src/main/appengine/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM gcr.io/google_appengine/jetty9
-
-RUN apt-get update && apt-get install -y fortunes
-ADD managed-vms-extendingruntime-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
diff --git a/managed_vms/extending-runtime/src/main/appengine/app.yaml b/managed_vms/extending-runtime/src/main/appengine/app.yaml
deleted file mode 100644
index 425bda136cd..00000000000
--- a/managed_vms/extending-runtime/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: custom
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java b/managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
deleted file mode 100644
index 8176049ec2f..00000000000
--- a/managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.extendingruntime;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "fortune", value = "")
-public class FortuneServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- PrintWriter out = resp.getWriter();
- String fortune = getFortune();
- out.println(fortune);
- }
-
- private String getFortune() throws IOException {
- File fort = new File("/usr/games/fortune");
- if (!fort.exists()) {
- return "It seems that the /usr/games/fortune application is not installed on your system.";
- }
- ProcessBuilder pb = new ProcessBuilder(fort.getAbsolutePath());
- File file = File.createTempFile("tmp_fortune", null);
- pb.redirectOutput(file);
- Process process = pb.start();
- try {
- process.waitFor();
- } catch (InterruptedException ex) {
- return ex.getMessage();
- }
- String fortune = "";
- String line;
- BufferedReader br = new BufferedReader(new FileReader(file));
- while ((line = br.readLine()) != null) {
- fortune = fortune + " " + line;
- }
- br.close();
- return fortune;
- }
-}
-// [END example]
diff --git a/managed_vms/helloworld/README.md b/managed_vms/helloworld/README.md
deleted file mode 100644
index 2f3da6f4144..00000000000
--- a/managed_vms/helloworld/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Appengine Helloworld sample for Google App Engine
-This sample demonstrates how to deploy an application on Google App Engine
-
-## Running locally
- $ mvn jetty:run
-
-## Deploying
- $ mvn gcloud:deploy
diff --git a/managed_vms/helloworld/pom.xml b/managed_vms/helloworld/pom.xml
deleted file mode 100644
index b29c41a3417..00000000000
--- a/managed_vms/helloworld/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-helloworld
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/helloworld/src/main/appengine/app.yaml b/managed_vms/helloworld/src/main/appengine/app.yaml
deleted file mode 100644
index 2a659160df5..00000000000
--- a/managed_vms/helloworld/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/helloworld/src/main/java/com/example/managedvms/helloworld/HelloServlet.java b/managed_vms/helloworld/src/main/java/com/example/managedvms/helloworld/HelloServlet.java
deleted file mode 100644
index 7f08b47e2b0..00000000000
--- a/managed_vms/helloworld/src/main/java/com/example/managedvms/helloworld/HelloServlet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.helloworld;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@WebServlet(name = "helloworld", value = "")
-@SuppressWarnings("serial")
-public class HelloServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- PrintWriter out = resp.getWriter();
- out.println("Hello, world");
- }
-}
-// [END example]
diff --git a/managed_vms/mailgun/README.md b/managed_vms/mailgun/README.md
deleted file mode 100644
index fd3b6c97681..00000000000
--- a/managed_vms/mailgun/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Java Mailgun email sample for Google App Engine Managed VMs
-This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
-For more information about Mailgun, see their [documentation](https://documentation.mailgun.com/).
-## Setup
-Before you can run or deploy the sample, you will need to do the following:
-1. [Create a Mailgun Account](http://www.mailgun.com/google). As of September 2015, Google users start with 30,000 free emails per month.
-2. Configure your Mailgun settings in the environment variables section in ``app.yaml``.
-## Running locally
-Refer to the [top-level README](../README.md) for instructions on running and deploying.
-You can run the application locally and send emails from your local machine. You
-will need to set environment variables before starting your application:
- $ export MAILGUN_API_KEY=[your-mailgun-api-key]
- $ export MAILGUN_DOMAIN_NAME=[your-mailgun-domain-name]
- $ mvn clean jetty:run
diff --git a/managed_vms/mailgun/pom.xml b/managed_vms/mailgun/pom.xml
deleted file mode 100644
index c5a5b7a05ec..00000000000
--- a/managed_vms/mailgun/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-mailgun
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.sun.jersey
- jersey-core
- 1.19.1
-
-
- com.sun.jersey
- jersey-client
- 1.19.1
-
-
- com.sun.jersey.contribs
- jersey-multipart
- 1.19.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/mailgun/src/main/appengine/app.yaml b/managed_vms/mailgun/src/main/appengine/app.yaml
deleted file mode 100644
index bf7142e6d6e..00000000000
--- a/managed_vms/mailgun/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- MAILGUN_DOMAIN_NAME: YOUR-MAILGUN-DOMAIN-NAME
- MAILGUN_API_KEY: YOUR-MAILGUN-API-KEY
-# [END env_variables]
-
diff --git a/managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java b/managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
deleted file mode 100644
index 0d7ca24f879..00000000000
--- a/managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.mailgun;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "mailgun", value = "/send/email")
-public class MailgunServlet extends HttpServlet {
-
- private static final String MAILGUN_DOMAIN_NAME = System.getenv("MAILGUN_DOMAIN_NAME");
- private static final String MAILGUN_API_KEY = System.getenv("MAILGUN_API_KEY");
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- String type = req.getParameter("submit");
- String recipient = req.getParameter("to");
- ClientResponse clientResponse;
- if (type.equals("Send simple email")) {
- clientResponse = sendSimpleMessage(recipient);
- } else {
- clientResponse = sendComplexMessage(recipient);
- }
- if (clientResponse.getStatus() == 200) {
- resp.getWriter().print("Email sent.");
- }
- }
-
- // [START simple]
- private ClientResponse sendSimpleMessage(String recipient) {
- Client client = Client.create();
- client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
- WebResource webResource = client.resource("https://api.mailgun.net/v3/" + MAILGUN_DOMAIN_NAME
- + "/messages");
- MultivaluedMapImpl formData = new MultivaluedMapImpl();
- formData.add("from", "Mailgun User ");
- formData.add("to", recipient);
- formData.add("subject", "Simple Mailgun Example");
- formData.add("text", "Plaintext content");
- return webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
- formData);
- }
- // [END simple]
-
- // [START complex]
- private ClientResponse sendComplexMessage(String recipient) {
- Client client = Client.create();
- client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
- WebResource webResource = client.resource("https://api.mailgun.net/v3/" + MAILGUN_DOMAIN_NAME
- + "/messages");
- FormDataMultiPart formData = new FormDataMultiPart();
- formData.field("from", "Mailgun User ");
- formData.field("to", recipient);
- formData.field("subject", "Complex Mailgun Example");
- formData.field("html", "HTML content");
- ClassLoader classLoader = getClass().getClassLoader();
- File txtFile = new File(classLoader.getResource("example-attachment.txt").getFile());
- formData.bodyPart(new FileDataBodyPart("attachment", txtFile, MediaType.TEXT_PLAIN_TYPE));
- return webResource.type(MediaType.MULTIPART_FORM_DATA_TYPE)
- .post(ClientResponse.class, formData);
- }
- // [END complex]
-}
-// [END example]
diff --git a/managed_vms/mailgun/src/main/resources/example-attachment.txt b/managed_vms/mailgun/src/main/resources/example-attachment.txt
deleted file mode 100644
index e0da678a932..00000000000
--- a/managed_vms/mailgun/src/main/resources/example-attachment.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a sample attachment.
\ No newline at end of file
diff --git a/managed_vms/mailgun/src/main/webapp/index.html b/managed_vms/mailgun/src/main/webapp/index.html
deleted file mode 100644
index 3b26f817c78..00000000000
--- a/managed_vms/mailgun/src/main/webapp/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Mailgun on Google App Engine Managed VMs
-
-
-
-
-
-
-
diff --git a/managed_vms/mailjet/README.md b/managed_vms/mailjet/README.md
deleted file mode 100644
index 37289ddc7fb..00000000000
--- a/managed_vms/mailjet/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mailjet sample for Google Managed VMs
-This sample demonstrates how to use [Mailjet](https://www.mailjet.com/) on Google Managed VMs to
-send emails from a verified sender you own.
-
-## Setup
-1. Before using, ensure the address you plan to send from has been verified in Mailjet.
-
-## Running locally
- $ export MAILJET_API_KEY=[your mailjet api key]
- $ export MAILJET_SECRET_KEY=[your mailjet secret key]
- $ mvn clean jetty:run
-
-## Deploying
-1. Edit the environment variables in the app.yaml with the appropriate Mailjet values.
- $ mvn clean gcloud:deploy
diff --git a/managed_vms/mailjet/pom.xml b/managed_vms/mailjet/pom.xml
deleted file mode 100644
index 3c21753347e..00000000000
--- a/managed_vms/mailjet/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-mailjet
-
- com.google.cloud
- doc-samples
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.mailjet
- mailjet-client
- 4.0.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/mailjet/src/main/appengine/app.yaml b/managed_vms/mailjet/src/main/appengine/app.yaml
deleted file mode 100644
index 3b3ed8ecd1d..00000000000
--- a/managed_vms/mailjet/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- MAILJET_API_KEY: YOUR-MAILJET-API-KEY
- MAILJET_SECRET_KEY: YOUR-MAILJET-SECRET-KEY
-# [END env_variables]
\ No newline at end of file
diff --git a/managed_vms/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java b/managed_vms/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
deleted file mode 100644
index 33411dc2717..00000000000
--- a/managed_vms/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-// [START mailjet_imports]
-package com.example.managedvms.mailjet;
-
-import com.mailjet.client.MailjetClient;
-import com.mailjet.client.MailjetRequest;
-import com.mailjet.client.MailjetResponse;
-import com.mailjet.client.errors.MailjetException;
-import com.mailjet.client.resource.Email;
-// [END mailjet_imports]
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START app]
-@SuppressWarnings("serial")
-@WebServlet(name = "mailjet", value = "/send/email")
-public class MailjetServlet extends HttpServlet {
- private static final String MAILJET_API_KEY = System.getenv("MAILJET_API_KEY");
- private static final String MAILJET_SECRET_KEY = System.getenv("MAILJET_SECRET_KEY");
- private MailjetClient client = new MailjetClient(MAILJET_API_KEY, MAILJET_SECRET_KEY);
-
- @Override
- public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String recipient = req.getParameter("to");
- String sender = req.getParameter("from");
-
- MailjetRequest email = new MailjetRequest(Email.resource)
- .property(Email.FROMEMAIL, sender)
- .property(Email.FROMNAME, "pandora")
- .property(Email.SUBJECT, "Your email flight plan!")
- .property(Email.TEXTPART,
- "Dear passenger, welcome to Mailjet! May the delivery force be with you!")
- .property(Email.HTMLPART,
- "
Dear passenger, welcome to Mailjet!
May the delivery force be with you!")
- .property(Email.RECIPIENTS, new JSONArray().put(new JSONObject().put("Email", recipient)));
-
- try {
- // trigger the API call
- MailjetResponse response = client.post(email);
- // Read the response data and status
- resp.getWriter().print(response.getStatus());
- resp.getWriter().print(response.getData());
- } catch (MailjetException e) {
- throw new ServletException("Mailjet Exception", e);
- }
- }
-}
-// [END app]
diff --git a/managed_vms/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar b/managed_vms/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
deleted file mode 100644
index e3b58094cf6..00000000000
Binary files a/managed_vms/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar and /dev/null differ
diff --git a/managed_vms/mailjet/src/main/webapp/index.html b/managed_vms/mailjet/src/main/webapp/index.html
deleted file mode 100644
index 037fddcea91..00000000000
--- a/managed_vms/mailjet/src/main/webapp/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- Mailgun on Google App Engine Managed VMs
-
-
-
-
-
-
-
diff --git a/managed_vms/memcache/pom.xml b/managed_vms/memcache/pom.xml
deleted file mode 100644
index 7769926fe99..00000000000
--- a/managed_vms/memcache/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-memcache
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.googlecode.xmemcached
- xmemcached
- 2.0.1
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/memcache/src/main/appengine/app.yaml b/managed_vms/memcache/src/main/appengine/app.yaml
deleted file mode 100644
index 7076ee01f42..00000000000
--- a/managed_vms/memcache/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START config]
-beta_settings:
- use_memcache_proxy: true
-# [END config]
-
diff --git a/managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java b/managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
deleted file mode 100644
index 966051f14a8..00000000000
--- a/managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.memcache;
-
-import net.rubyeye.xmemcached.MemcachedClient;
-import net.rubyeye.xmemcached.MemcachedClientBuilder;
-import net.rubyeye.xmemcached.XMemcachedClientBuilder;
-import net.rubyeye.xmemcached.exception.MemcachedException;
-import net.rubyeye.xmemcached.utils.AddrUtil;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "memcache", value = "")
-public class MemcacheServlet extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- String addr =
- System.getenv().containsKey("MEMCACHE_PORT_11211_TCP_ADDR")
- ? System.getenv("MEMCACHE_PORT_11211_TCP_ADDR") : "localhost";
- String port =
- System.getenv().containsKey("MEMCACHE_PORT_11211_TCP_ADDR")
- ? System.getenv("MEMCACHE_PORT_11211_TCP_PORT") : "11211";
- String key = "count";
- MemcachedClientBuilder builder = new XMemcachedClientBuilder(
- AddrUtil.getAddresses(addr + ":" + port));
- MemcachedClient client = builder.build();
- long count = 0L;
- try {
- count = client.incr(key, 1L, 0L);
- } catch (TimeoutException | InterruptedException | MemcachedException e) {
- throw new ServletException("Memcache error", e);
- }
- resp.setContentType("text/plain");
- resp.getWriter().print("Value is " + count + "\n");
- }
-}
-// [END example]
diff --git a/managed_vms/sendgrid/README.md b/managed_vms/sendgrid/README.md
deleted file mode 100644
index d7786659624..00000000000
--- a/managed_vms/sendgrid/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Java SendGrid Email Sample for Google App Engine Flexible Environment
-
-This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on
-[Google App Engine flexible environment][aeflex-docs].
-
-See the [sample application documentaion][sample-docs] for more detailed
-instructions.
-
-For more information about SendGrid, see their
-[documentation](https://sendgrid.com/docs/User_Guide/index.html).
-
-[aeflex-docs]: https://cloud.google.com/appengine/docs/flexible/
-[sample-docs]: https://cloud.google.com/appengine/docs/flexible/java/sending-emails-with-sendgrid
-
-## Setup
-
-Before you can run or deploy the sample, you will need to do the following:
-
-1. [Create a SendGrid Account](http://sendgrid.com/partner/google). As of
- September 2015, Google users start with 25,000 free emails per month.
-1. Configure your SendGrid settings in the environment variables section in
- [`src/main/appengine/app.yaml`](src/main/appengine/app.yaml).
-
-## Running locally
-
-You can run the application locally and send emails from your local machine. You
-will need to set environment variables before starting your application:
-
- $ export SENDGRID_API_KEY=[your-sendgrid-api-key]
- $ export SENDGRID_SENDER=[your-sendgrid-sender-email-address]
- $ mvn clean jetty:run
diff --git a/managed_vms/sendgrid/pom.xml b/managed_vms/sendgrid/pom.xml
deleted file mode 100644
index 21cd80a9940..00000000000
--- a/managed_vms/sendgrid/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-sendgrid
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
- com.sendgrid
- sendgrid-java
- 2.2.2
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/sendgrid/src/main/appengine/app.yaml b/managed_vms/sendgrid/src/main/appengine/app.yaml
deleted file mode 100644
index fd699d3ec1c..00000000000
--- a/managed_vms/sendgrid/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- SENDGRID_API_KEY: YOUR-SENDGRID-API-KEY
- SENDGRID_SENDER: YOUR-SENDGRID-SENDER
-# [END env_variables]
-
diff --git a/managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java b/managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
deleted file mode 100644
index 8e6f377f757..00000000000
--- a/managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.sendgrid;
-
-import com.sendgrid.SendGrid;
-import com.sendgrid.SendGridException;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "sendemail", value = "/send/email")
-public class SendEmailServlet extends HttpServlet {
-
- @Override
- public void service(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- final String sendgridApiKey = System.getenv("SENDGRID_API_KEY");
- final String sendgridSender = System.getenv("SENDGRID_SENDER");
- final String toEmail = req.getParameter("to");
- if (toEmail == null) {
- resp.getWriter()
- .print("Please provide an email address in the \"to\" query string parameter.");
- return;
- }
-
- SendGrid sendgrid = new SendGrid(sendgridApiKey);
- SendGrid.Email email = new SendGrid.Email();
- email.addTo(toEmail);
- email.setFrom(sendgridSender);
- email.setSubject("This is a test email");
- email.setText("Example text body.");
-
- try {
- SendGrid.Response response = sendgrid.send(email);
- if (response.getCode() != 200) {
- resp.getWriter().print(String.format("An error occured: %s", response.getMessage()));
- return;
- }
- resp.getWriter().print("Email sent.");
- } catch (SendGridException e) {
- throw new ServletException("SendGrid error", e);
- }
- }
-}
-// [END example]
diff --git a/managed_vms/sparkjava/README.md b/managed_vms/sparkjava/README.md
deleted file mode 100644
index a809fa0815b..00000000000
--- a/managed_vms/sparkjava/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# SparkJava on App Engine Flexible Environment
-
-This app demonstrates how to use [`gcloud-java`'s Datastore client](https://github.com/GoogleCloudPlatform/gcloud-java/tree/master/gcloud-java-datastore#google-cloud-java-client-for-datastore) from within an [App Engine flexible environment](https://cloud.google.com/appengine/docs/flexible/java/hello-world) project using [SparkJava](http://sparkjava.com/). The app allows you to create and modify a database of "users", which contains their ID, name, and email information.
-
-`gcloud-java` is an idiomatic Java client for [Google Cloud Platform](https://cloud.google.com/) services. Read more about the library [here](https://github.com/GoogleCloudPlatform/gcloud-java#google-cloud-java-client).
-
-Setup
------
-
-1. Create a Google Developers Console project with the Datastore API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. If you wish to deploy this application, you will also need to [enable billing](https://support.google.com/cloud/?rd=2#topic=6288636).
-
-2. Set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
-
-3. Ensure that you have Maven installed and configured to use Java 8. See installation instructions [here](https://maven.apache.org/install.html).
-
-Running locally
----------------
-
-Run the application on your local machine by typing the following into your command line from the `sparkjava` directory: `mvn clean package exec:java`. Navigate to `localhost:8080` to view and interact with the application.
-
-Deploying
----------
-
-If you've enabled billing (step 1 in [Setup](#Setup)), you can deploy the application to the web by running `mvn gcloud:deploy` from your command line (from the `sparkjava` directory).
-
-How does it work?
------------------
-
-You'll notice that the source code is split into three folders: `appengine`, `java/com/google/appengine/sparkdemo`, and `resource/public`. The `appengine` folder contains a `Dockerfile` and an `app.yaml`, necessary files to [configure the VM environment](https://cloud.google.com/appengine/docs/managed-vms/config). The `java/com/google/appengine/sparkdemo` folder contains the controller code, which uses the `gcloud-java` library to modify the records in the Google Cloud Datastore. Finally, the `resource/public` folder contains the home webpage, which uses jQuery to send HTTP requests to create, remove, and update records.
-
-Spark runs the [`main` method](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managedvms/sparkjava-demo/src/main/java/com/google/appengine/sparkdemo/Main.java) upon server startup. The `main` method creates the controller, [`UserController`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managedvms/sparkjava-demo/src/main/java/com/google/appengine/sparkdemo/UserController.java). The URIs used to send HTTP requests in the [home page](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managedvms/sparkjava-demo/src/main/resources/public/index.html) correspond to methods in the `UserController` class. For example, the `index.html` code for `create` makes a `POST` request to the path `/api/users` with a body containing the name and email of a user to add. `UserController` contains the following code to process that request:
-
-```java
-post("/api/users", (req, res) -> userService.createUser(
- req.queryParams("name"),
- req.queryParams("email),
-), json());
-```
-This code snippet gets the name and email of the user from the POST request and passes it to `createUser` (in [`UserService.java`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managedvms/sparkjava-demo/src/main/java/com/google/appengine/sparkdemo/UserService.java)) to create a database record using `gcloud-java`. If you want a more in-depth tutorial on using `gcloud-java` Datastore client, see the [Getting Started](https://github.com/GoogleCloudPlatform/gcloud-java/tree/master/gcloud-java-datastore#getting-started) section in the `gcloud-java-datastore` documentation.
-
-Communication with the Google Cloud Datastore requires authentication and setting a project ID. When running locally, `gcloud-java` automatically detects your credentials and project ID because you logged into the Google Cloud SDK and set your project ID. There are also many other options for authenticating and setting a project ID. To read more, see the [Authentication](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and [Specifying a Project ID](https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id) sections of the `gcloud-java` documentation.
-
-You built and ran this application using Maven. To read more about using Maven with Managed VMs, see the [Using Apache Maven documentation](https://cloud.google.com/appengine/docs/java/managed-vms/maven). While this particular project uses Maven, `gcloud-java` can also be accessed using Gradle and SBT. See how to obtain the dependency in the [Quickstart section](https://github.com/GoogleCloudPlatform/gcloud-java#quickstart) of the `gcloud-java` documentation.
-
-License
--------
-
-Apache 2.0 - See [LICENSE](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/LICENSE) for more information.
diff --git a/managed_vms/sparkjava/pom.xml b/managed_vms/sparkjava/pom.xml
deleted file mode 100644
index 8e3c3e3f491..00000000000
--- a/managed_vms/sparkjava/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- 4.0.0
- com.google.appengine.sparkdemo
- managed-vms-spark
- 1.0
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- com.sparkjava
- spark-core
- 2.5
-
-
- org.slf4j
- slf4j-simple
- 1.7.21
-
-
- com.google.code.gson
- gson
- 2.7
-
-
- junit
- junit
- 4.12
-
-
- com.google.cloud
- gcloud-java
- 0.2.7
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.5.1
-
- 1.8
- 1.8
-
-
-
-
-
- maven-assembly-plugin
-
-
- package
-
- single
-
-
-
-
-
- jar-with-dependencies
-
-
-
- com.google.appengine.sparkdemo.Main
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.4.0
-
- com.google.appengine.sparkdemo.Main
-
- -jar
- target/sparkdemo-1.0-jar-with-dependencies.jar
-
-
-
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
-
-
-
-
diff --git a/managed_vms/sparkjava/src/main/appengine/Dockerfile b/managed_vms/sparkjava/src/main/appengine/Dockerfile
deleted file mode 100644
index db698b196de..00000000000
--- a/managed_vms/sparkjava/src/main/appengine/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM gcr.io/google_appengine/openjdk8
-VOLUME /tmp
-ADD managed-vms-spark-1.0-jar-with-dependencies.jar app.jar
-CMD [ "java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
diff --git a/managed_vms/sparkjava/src/main/appengine/app.yaml b/managed_vms/sparkjava/src/main/appengine/app.yaml
deleted file mode 100644
index e8b73970590..00000000000
--- a/managed_vms/sparkjava/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-runtime: custom
-vm: true
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
deleted file mode 100644
index 745a31f6945..00000000000
--- a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import static spark.Spark.port;
-
-import com.google.cloud.datastore.DatastoreOptions;
-
-public class Main {
-
- /**
- * Starts the webapp on localhost:8080.
- */
- public static void main(String[] args) {
- port(8080);
- String kind = "DemoUser";
- if (args != null) {
- for (String arg : args) {
- if (arg.startsWith("kind=")) {
- kind = arg.substring("kind=".length());
- }
- }
- }
- UserController userController =
- new UserController(new UserService(DatastoreOptions.defaultInstance().service(), kind));
- }
-}
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
deleted file mode 100644
index d01e1556453..00000000000
--- a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-public class ResponseError {
-
- private String message;
-
- public ResponseError(String message, String... args) {
- this.message = String.format(message, (Object) args);
- }
-
- public ResponseError(Exception ex) {
- this.message = ex.getMessage();
- }
-}
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
deleted file mode 100644
index 44969b40fbb..00000000000
--- a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import java.util.UUID;
-
-public class User {
-
- private String id;
- private String name;
- private String email;
-
- /**
- * Construct a user given a name and email. An ID is auto-generated for the user.
- */
- public User(String name, String email) {
- this(UUID.randomUUID().toString(), name, email);
- }
-
- /**
- * Construct a user given an ID, name, and email.
- */
- public User(String id, String name, String email) {
- this.id = id;
- this.email = email;
- this.name = name;
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getEmail() {
- return email;
- }
-
- void setId(String id) {
- this.id = id;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-}
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
deleted file mode 100644
index 0c1a5096af6..00000000000
--- a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import static spark.Spark.after;
-import static spark.Spark.delete;
-import static spark.Spark.exception;
-import static spark.Spark.get;
-import static spark.Spark.post;
-import static spark.Spark.put;
-
-import com.google.gson.Gson;
-
-import spark.ResponseTransformer;
-import spark.Spark;
-
-public class UserController {
-
- /**
- * Creates a controller that maps requests to gcloud-java functions.
- */
- public UserController(final UserService userService) {
- Spark.staticFileLocation("/public");
-
- get("/api/users", (req, res) -> userService.getAllUsers(), json());
-
- get("/api/users/:id", (req, res) -> userService.getUser(req.params(":id")), json());
-
- post("/api/users",
- (req, res) -> userService.createUser(req.queryParams("name"), req.queryParams("email")),
- json());
-
- put("/api/users/:id", (req, res) -> userService.updateUser(
- req.params(":id"),
- req.queryParams("name"),
- req.queryParams("email")
- ), json());
-
- delete("/api/users/:id", (req, res) -> userService.deleteUser(req.params(":id")), json());
-
- after((req, res) -> {
- res.type("application/json");
- });
-
- exception(IllegalArgumentException.class, (error, req, res) -> {
- res.status(400);
- res.body(toJson(new ResponseError(error)));
- });
- }
-
- private static String toJson(Object object) {
- return new Gson().toJson(object);
- }
-
- private static ResponseTransformer json() {
- return UserController::toJson;
- }
-}
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
deleted file mode 100644
index dce6dc7baeb..00000000000
--- a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.KeyFactory;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.QueryResults;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class UserService {
-
- private final Datastore datastore;
- private final KeyFactory keyFactory;
- private final String kind;
-
- /**
- * Constructor for UserService.
- *
- * @param datastore gcloud-java Datastore service object to execute requests
- * @param kind the kind for the Datastore entities in this demo
- */
- public UserService(Datastore datastore, String kind) {
- this.datastore = datastore;
- this.keyFactory = datastore.newKeyFactory().kind(kind);
- this.kind = kind;
- }
-
- /**
- * Return a list of all users.
- */
- public List getAllUsers() {
- Query query =
- Query.gqlQueryBuilder(Query.ResultType.ENTITY, "SELECT * FROM " + kind).build();
- QueryResults results = datastore.run(query);
- List users = new ArrayList<>();
- while (results.hasNext()) {
- Entity result = results.next();
- users.add(
- new User(result.getString("id"), result.getString("name"), result.getString("email")));
- }
- return users;
- }
-
- /**
- * Return the user with the given id.
- */
- User getUser(String id) {
- Entity entity = datastore.get(keyFactory.newKey(id));
- return entity == null
- ? null
- : new User(entity.getString("id"), entity.getString("name"), entity.getString("email"));
- }
-
- /**
- * Create a new user and add it to Cloud Datastore.
- */
- public User createUser(String name, String email) {
- failIfInvalid(name, email);
- User user = new User(name, email);
- Key key = keyFactory.newKey(user.getId());
- Entity entity = Entity.builder(key)
- .set("id", user.getId())
- .set("name", name)
- .set("email", email)
- .build();
- datastore.add(entity);
- return user;
- }
-
- /**
- * Delete a user from Cloud Datastore.
- */
- public String deleteUser(String id) {
- Key key = keyFactory.newKey(id);
- datastore.delete(key);
- return "ok";
- }
-
- /**
- * Updates a user in Cloud Datastore.
- */
- public User updateUser(String id, String name, String email) {
- failIfInvalid(name, email);
- Key key = keyFactory.newKey(id);
- Entity entity = datastore.get(key);
- if (entity == null) {
- throw new IllegalArgumentException("No user with id '" + id + "' found");
- } else {
- entity = Entity.builder(entity)
- .set("id", id)
- .set("name", name)
- .set("email", email)
- .build();
- datastore.update(entity);
- }
- return new User(id, name, email);
- }
-
- private void failIfInvalid(String name, String email) {
- checkArgument(name != null && !name.isEmpty(), "Parameter 'name' cannot be empty");
- checkArgument(email != null && !email.isEmpty(), "Parameter 'email' cannot be empty");
- }
-}
diff --git a/managed_vms/sparkjava/src/main/resources/public/index.html b/managed_vms/sparkjava/src/main/resources/public/index.html
deleted file mode 100644
index ba7adea7ee0..00000000000
--- a/managed_vms/sparkjava/src/main/resources/public/index.html
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
User Database
-
Using App Engine Managed VMs, Google Cloud Datastore, and SparkJava.
-
-
-
All users
-
-
-
-
-
-
-
ID
-
Name
-
Email
-
Actions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Add a user
-
-
-
-
-
-
-
-
-
-
diff --git a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java b/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
deleted file mode 100644
index 3b02cc7c3fe..00000000000
--- a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.google.gson.Gson;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import spark.Spark;
-import spark.utils.IOUtils;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.UUID;
-
-public class UserControllerTest {
-
- private static final String USER_NAME = "myName";
- private static final String USER_EMAIL = "my@email.com";
- private static String userId;
-
- @BeforeClass
- public static void beforeClass() {
- Main.main(new String[] {"kind=DemoUser" + UUID.randomUUID().toString().replaceAll("-", "")});
- Spark.awaitInitialization();
- }
-
- @Before
- public void setUp() throws IOException {
- userId = createUser(USER_NAME, USER_EMAIL).getId();
- }
-
- @After
- public void tearDown() throws IOException {
- deleteUser(userId);
- }
-
- @AfterClass
- public static void afterClass() {
- Spark.stop();
- }
-
- @Test
- public void testGetAllUsers() throws IOException {
- User[] users = getAllUsers();
- assertTrue(users.length <= 1);
- }
-
- @Test
- public void testCreateUser() throws IOException {
- User user = createUser(USER_NAME, USER_EMAIL);
- assertNotNull(user.getId());
- assertEquals(USER_NAME, user.getName());
- assertEquals(USER_EMAIL, user.getEmail());
- }
-
- @Test
- public void testCreateUserInvalidRequest() {
- try {
- executeRequest("POST", "/api/users?name=&email=");
- fail("Should fail due to an invalid request.");
- } catch (IOException e) {
- assertTrue(e.getMessage().startsWith("Server returned HTTP response code: 400 for URL"));
- }
- }
-
- @Test
- public void testDeleteUser() throws IOException {
- assertNotNull(getUser(userId));
- assertEquals("\"ok\"", deleteUser(userId));
- assertNull(getUser(userId));
- }
-
- @Test
- public void updateUser() throws IOException {
- String newName = "myNewName";
- String newEmail = "mynew@email.com";
- String responseStr = executeRequest(
- "PUT",
- "/api/users/" + userId + "?id=" + userId + "&name=" + newName + "&email=" + newEmail);
- User updatedUser = new Gson().fromJson(responseStr, User.class);
- assertEquals(userId, updatedUser.getId());
- assertEquals(newName, updatedUser.getName());
- assertEquals(newEmail, updatedUser.getEmail());
- }
-
- private static String executeRequest(String method, String path) throws IOException {
- URL url = new URL("http://localhost:8080" + path);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod(method);
- connection.setDoOutput(true);
- connection.connect();
- return IOUtils.toString(connection.getInputStream());
- }
-
- private static User createUser(String name, String email) throws IOException {
- return new Gson().fromJson(
- executeRequest("POST", "/api/users?name=" + name + "&email=" + email), User.class);
- }
-
- private static String deleteUser(String id) throws IOException {
- return executeRequest("DELETE", "/api/users/" + id);
- }
-
- private static User getUser(String id) throws IOException {
- return new Gson().fromJson(executeRequest("GET", "/api/users/" + id), User.class);
- }
-
- private static User[] getAllUsers() throws IOException {
- return new Gson().fromJson(executeRequest("GET", "/api/users"), User[].class);
- }
-}
diff --git a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
deleted file mode 100644
index 5d4ba6797a7..00000000000
--- a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
- *
- * 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.google.appengine.sparkdemo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.DatastoreOptions;
-import com.google.cloud.datastore.Entity;
-import com.google.cloud.datastore.Key;
-import com.google.cloud.datastore.Query;
-import com.google.cloud.datastore.QueryResults;
-import com.google.cloud.datastore.StructuredQuery;
-import com.google.cloud.datastore.testing.LocalDatastoreHelper;
-import com.google.common.collect.Iterators;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.List;
-
-public class UserServiceTest {
-
- private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
- private static final DatastoreOptions DATASTORE_OPTIONS = HELPER.options();
- private static final Datastore DATASTORE = DATASTORE_OPTIONS.service();
- private static final String KIND = "DemoUser";
- private static final UserService USER_SERVICE = new UserService(DATASTORE, KIND);
- private static final String USER_ID = "myId";
- private static final String USER_NAME = "myName";
- private static final String USER_EMAIL = "my@email.com";
- private static final User USER = new User(USER_ID, USER_NAME, USER_EMAIL);
- private static final Key USER_KEY =
- Key.builder(DATASTORE_OPTIONS.projectId(), KIND, USER_ID).build();
- private static final Entity USER_RECORD = Entity.builder(USER_KEY)
- .set("id", USER_ID)
- .set("name", USER_NAME)
- .set("email", USER_EMAIL)
- .build();
-
- @BeforeClass
- public static void beforeClass() throws IOException, InterruptedException {
- HELPER.start();
- }
-
- @Before
- public void setUp() {
- StructuredQuery query = Query.keyQueryBuilder().build();
- QueryResults result = DATASTORE.run(query);
- DATASTORE.delete(Iterators.toArray(result, Key.class));
- DATASTORE.add(USER_RECORD);
- }
-
- @AfterClass
- public static void afterClass() throws IOException, InterruptedException {
- HELPER.stop();
- }
-
- @Test
- public void testGetAllUsers() {
- List allUsers = USER_SERVICE.getAllUsers();
- assertEquals(1, allUsers.size());
- User actualUser = allUsers.get(0);
- assertEquals(USER.getId(), actualUser.getId());
- assertEquals(USER.getName(), actualUser.getName());
- assertEquals(USER.getEmail(), actualUser.getEmail());
- }
-
- @Test
- public void testCreateUser() {
- String name = "myNewName";
- String email = "mynew@email.com";
- User actualUser = USER_SERVICE.createUser(name, email);
- assertEquals(name, actualUser.getName());
- assertEquals(email, actualUser.getEmail());
- assertNotNull(actualUser.getId());
- try {
- USER_SERVICE.createUser(null, email);
- fail("Expected to fail because name is null.");
- } catch (IllegalArgumentException e) {
- assertEquals("Parameter 'name' cannot be empty", e.getMessage());
- }
- try {
- USER_SERVICE.createUser(name, null);
- fail("Expected to fail because email is null.");
- } catch (IllegalArgumentException e) {
- assertEquals("Parameter 'email' cannot be empty", e.getMessage());
- }
- }
-
- @Test
- public void testDeleteUser() {
- String result = USER_SERVICE.deleteUser(USER_ID);
- assertEquals("ok", result);
- assertNull(DATASTORE.get(USER_KEY));
- }
-
- @Test
- public void testUpdateUser() {
- String newName = "myNewName";
- String newEmail = "mynew@email.com";
- User updatedUser = USER_SERVICE.updateUser(USER_ID, newName, newEmail);
- assertEquals(USER_ID, updatedUser.getId());
- assertEquals(newName, updatedUser.getName());
- assertEquals(newEmail, updatedUser.getEmail());
- try {
- USER_SERVICE.updateUser(USER_ID, null, USER_EMAIL);
- fail("Expected to fail because name is null.");
- } catch (IllegalArgumentException e) {
- assertEquals("Parameter 'name' cannot be empty", e.getMessage());
- }
- try {
- USER_SERVICE.updateUser(USER_ID, USER_NAME, null);
- fail("Expected to fail because email is null.");
- } catch (IllegalArgumentException e) {
- assertEquals("Parameter 'email' cannot be empty", e.getMessage());
- }
- }
-}
diff --git a/managed_vms/static-files/pom.xml b/managed_vms/static-files/pom.xml
deleted file mode 100644
index bf2ef49cacf..00000000000
--- a/managed_vms/static-files/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-staticfiles
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/static-files/src/main/appengine/app.yaml b/managed_vms/static-files/src/main/appengine/app.yaml
deleted file mode 100644
index 2a659160df5..00000000000
--- a/managed_vms/static-files/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
diff --git a/managed_vms/static-files/src/main/webapp/index.html b/managed_vms/static-files/src/main/webapp/index.html
deleted file mode 100644
index d1643e9a6b1..00000000000
--- a/managed_vms/static-files/src/main/webapp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-Static Files
-
-
-
-
This is a static file serving example.
-
-
diff --git a/managed_vms/static-files/src/main/webapp/stylesheets/styles.css b/managed_vms/static-files/src/main/webapp/stylesheets/styles.css
deleted file mode 100644
index 573f441093f..00000000000
--- a/managed_vms/static-files/src/main/webapp/stylesheets/styles.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
- font-family: Verdana, Helvetica, sans-serif;
- background-color: #CCCCFF;
-}
diff --git a/managed_vms/twilio/README.md b/managed_vms/twilio/README.md
deleted file mode 100644
index a1234c78af6..00000000000
--- a/managed_vms/twilio/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Java Twilio Voice and SMS Sample for Google App Engine Flexible Environment
-
-This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google
-App flexible environment][aeflex-docs].
-
-See the [sample application documentaion][sample-docs] for more detailed
-instructions.
-
-For more information about Twilio, see their [Java quickstart
-tutorials](https://www.twilio.com/docs/quickstart/java).
-
-[aeflex-docs]: https://cloud.google.com/appengine/docs/flexible/
-[sample-docs]: https://cloud.google.com/appengine/docs/flexible/java/using-sms-and-voice-services-via-twilio
-
-
-## Setup
-
-Before you can run or deploy the sample, you will need to do the following:
-
-1. [Create a Twilio Account](http://ahoy.twilio.com/googlecloudplatform). Google
- App Engine customers receive a complimentary credit for SMS messages and
- inbound messages.
-1. Create a number on twilio, and configure the voice request URL to be
- ``https://your-app-id.appspot.com/call/receive`` and the SMS request URL to
- be ``https://your-app-id.appspot.com/sms/receive``.
-1. Configure your Twilio settings in the environment variables section in
- ``src/main/appengine/app.yaml``.
-
-## Running locally
-
-You can run the application locally to test the callbacks and SMS sending. You
-will need to set environment variables before starting your application:
-
- $ export TWILIO_ACCOUNT_SID=[your-twilio-accoun-sid]
- $ export TWILIO_AUTH_TOKEN=[your-twilio-auth-token]
- $ export TWILIO_NUMBER=[your-twilio-number]
- $ mvn clean jetty:run
diff --git a/managed_vms/twilio/pom.xml b/managed_vms/twilio/pom.xml
deleted file mode 100644
index b8cbb56b315..00000000000
--- a/managed_vms/twilio/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- war
- 1.0-SNAPSHOT
- com.example.managedvms
- managed-vms-twilio
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
-
- com.twilio.sdk
- twilio-java-sdk
- 6.3.0
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- jar
- provided
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- com.google.appengine
- gcloud-maven-plugin
- 2.0.9.106.v20160420
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
-
- org.apache.maven.plugins
- 3.3
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
- 9.3.7.v20160115
-
-
-
-
diff --git a/managed_vms/twilio/src/main/appengine/app.yaml b/managed_vms/twilio/src/main/appengine/app.yaml
deleted file mode 100644
index 46ccf5f90ff..00000000000
--- a/managed_vms/twilio/src/main/appengine/app.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-runtime: java
-vm: true
-
-handlers:
-- url: /.*
- script: this field is required, but ignored
- secure: always
-
-# [START env_variables]
-env_variables:
- TWILIO_ACCOUNT_SID: YOUR-TWILIO-ACCOUNT-SID
- TWILIO_AUTH_TOKEN: YOUR-TWILIO-AUTH-TOKEN
- TWILIO_NUMBER: YOUR-TWILIO-NUMBER
-# [END env_variables]
-
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
deleted file mode 100644
index 5d2c2b0d207..00000000000
--- a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.twilio;
-
-import com.twilio.sdk.verbs.Say;
-import com.twilio.sdk.verbs.TwiMLException;
-import com.twilio.sdk.verbs.TwiMLResponse;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "receivecall", value = "/call/receive")
-public class ReceiveCallServlet extends HttpServlet {
-
- @Override
- public void service(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- TwiMLResponse twiml = new TwiMLResponse();
- Say say = new Say("Hello from Twilio!");
- try {
- twiml.append(say);
- } catch (TwiMLException e) {
- throw new ServletException("Twilio error", e);
- }
-
- resp.setContentType("application/xml");
- resp.getWriter().print(twiml.toXML());
- }
-}
-// [END example]
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
deleted file mode 100644
index 5d289da692c..00000000000
--- a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.twilio;
-
-import com.twilio.sdk.verbs.Message;
-import com.twilio.sdk.verbs.TwiMLException;
-import com.twilio.sdk.verbs.TwiMLResponse;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "receivesms", value = "/sms/receive")
-public class ReceiveSmsServlet extends HttpServlet {
-
- @Override
- public void service(HttpServletRequest request, HttpServletResponse response) throws IOException,
- ServletException {
- String fromNumber = request.getParameter("From");
- String body = request.getParameter("Body");
- String message = String.format("Hello, %s, you said %s", fromNumber, body);
-
- TwiMLResponse twiml = new TwiMLResponse();
- Message sms = new Message(message);
- try {
- twiml.append(sms);
- } catch (TwiMLException e) {
- throw new ServletException("Twilio error", e);
- }
-
- response.setContentType("application/xml");
- response.getWriter().print(twiml.toXML());
- }
-}
-// [END example]
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
deleted file mode 100644
index 5aa9977dd93..00000000000
--- a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.managedvms.twilio;
-
-import com.twilio.sdk.TwilioRestClient;
-import com.twilio.sdk.TwilioRestException;
-import com.twilio.sdk.resource.factory.MessageFactory;
-import com.twilio.sdk.resource.instance.Account;
-import com.twilio.sdk.resource.instance.Message;
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-// [START example]
-@SuppressWarnings("serial")
-@WebServlet(name = "sendsms", value = "/sms/send")
-public class SendSmsServlet extends HttpServlet {
-
- @Override
- public void service(HttpServletRequest req, HttpServletResponse resp) throws IOException,
- ServletException {
- final String twilioAccountSid = System.getenv("TWILIO_ACCOUNT_SID");
- final String twilioAuthToken = System.getenv("TWILIO_AUTH_TOKEN");
- final String twilioNumber = System.getenv("TWILIO_NUMBER");
- final String toNumber = (String) req.getParameter("to");
- if (toNumber == null) {
- resp.getWriter()
- .print("Please provide the number to message in the \"to\" query string parameter.");
- return;
- }
- TwilioRestClient client = new TwilioRestClient(twilioAccountSid, twilioAuthToken);
- Account account = client.getAccount();
- MessageFactory messageFactory = account.getMessageFactory();
- List params = new ArrayList();
- params.add(new BasicNameValuePair("To", toNumber));
- params.add(new BasicNameValuePair("From", twilioNumber));
- params.add(new BasicNameValuePair("Body", "Hello from Twilio!"));
- try {
- Message sms = messageFactory.create(params);
- resp.getWriter().print(sms.getBody());
- } catch (TwilioRestException e) {
- throw new ServletException("Twilio error", e);
- }
- }
-}
-// [END example]
diff --git a/monitoring/v2/pom.xml b/monitoring/v2/pom.xml
deleted file mode 100644
index 631a9cdc820..00000000000
--- a/monitoring/v2/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
- 4.0.0
- com.google.cloud.monitoring.samples
- cloud-monitoring-samples
- jar
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
-
-
- googleapis
- https://google-api-client-libraries.appspot.com/mavenrepo
-
-
-
-
-
- com.google.apis
- google-api-services-cloudmonitoring
- v2beta2-rev62-1.22.0
-
-
- com.google.oauth-client
- google-oauth-client
- ${project.oauth.version}
-
-
- com.google.http-client
- google-http-client-jackson2
- ${project.http.version}
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- ${project.oauth.version}
-
-
- junit
- junit
-
-
- com.jcabi
- jcabi-matchers
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
- src/main/java
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.2
-
- 5
- 5
-
-
-
-
-
-
diff --git a/monitoring/v2/src/main/java/CloudMonitoringAuthSample.java b/monitoring/v2/src/main/java/CloudMonitoringAuthSample.java
deleted file mode 100644
index 537c074ed34..00000000000
--- a/monitoring/v2/src/main/java/CloudMonitoringAuthSample.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2015 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.
- */
-// [START all]
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.cloudmonitoring.CloudMonitoring;
-import com.google.api.services.cloudmonitoring.CloudMonitoringScopes;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-/**
- * Simple command-line program to demonstrate connecting to and retrieving data
- * from the Google Cloud Monitoring API using application default credentials.
- * Please see README.md on instructions to run.
- */
-public final class CloudMonitoringAuthSample {
-
- /**
- * The metric that we want to fetch.
- */
- private static final String METRIC =
- "compute.googleapis.com/instance/disk/read_ops_count";
-
- /**
- * The end of the time interval to fetch.
- */
- private static final String YOUNGEST = "2015-01-01T00:00:00Z";
-
- /**
- * Utility class doesn't need to be instantiated.
- */
- private CloudMonitoringAuthSample() { }
-
-
- /**
- * Builds and returns a CloudMonitoring service object authorized with the
- * application default credentials.
- *
- * @return CloudMonitoring service object that is ready to make requests.
- * @throws GeneralSecurityException if authentication fails.
- * @throws IOException if authentication fails.
- */
- private static CloudMonitoring authenticate()
- throws GeneralSecurityException, IOException {
- // Grab the Application Default Credentials from the environment.
- GoogleCredential credential = GoogleCredential.getApplicationDefault()
- .createScoped(CloudMonitoringScopes.all());
-
- // Create and return the CloudMonitoring service object
- HttpTransport httpTransport = new NetHttpTransport();
- JsonFactory jsonFactory = new JacksonFactory();
- CloudMonitoring service = new CloudMonitoring.Builder(httpTransport,
- jsonFactory, credential)
- .setApplicationName("Demo")
- .build();
- return service;
- }
-
- /**
- * Query the Google Cloud Monitoring API using a service account and print the
- * result to the console.
- *
- * @param args The first arg should be the project name you'd like to inspect.
- * @throws Exception if something goes wrong.
- */
- public static void main(final String[] args) throws Exception {
- if (args.length != 1) {
- System.err.println(String.format("Usage: %s ",
- CloudMonitoringAuthSample.class.getSimpleName()));
- return;
- }
-
- String project = args[0];
-
- // Create an authorized API client
- CloudMonitoring cloudmonitoring = authenticate();
-
- CloudMonitoring.Timeseries.List timeseriesListRequest =
- cloudmonitoring.timeseries().list(project, METRIC, YOUNGEST);
-
- System.out.println("Timeseries.list raw response:");
- System.out.println(timeseriesListRequest.execute().toPrettyString());
-
-
- }
-}
-// [END all]
diff --git a/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java b/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java
deleted file mode 100644
index 878d959e16e..00000000000
--- a/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * Tests the Cloud Monitoring auth sample.
- */
-public class CloudMonitoringAuthSampleTest {
- private final ByteArrayOutputStream stdout =
- new ByteArrayOutputStream();
- private final ByteArrayOutputStream stderr =
- new ByteArrayOutputStream();
- private static final PrintStream REAL_OUT = System.out;
- private static final PrintStream REAL_ERR = System.err;
-
- @Before
- public void setUp() {
- System.setOut(new PrintStream(stdout));
- System.setErr(new PrintStream(stderr));
- }
-
- @After
- public void tearDown() {
- System.setOut(this.REAL_OUT);
- System.setErr(this.REAL_ERR);
- }
-
- @Test
- public void testUsage() throws Exception {
- CloudMonitoringAuthSample.main(new String[] { });
- assertThat(stderr.toString())
- .named("stderr")
- .isEqualTo("Usage: CloudMonitoringAuthSample \n");
- }
-
- @Test
- public void testListTimeSeries() throws Exception {
- CloudMonitoringAuthSample.main(new String[] { "cloud-samples-tests" });
- String out = stdout.toString();
- assertThat(out).named("stdout").contains("Timeseries.list raw response:");
- assertThat(out)
- .named("stdout")
- .containsMatch("\\{\\s*\"kind\" *: *\"cloudmonitoring#listTimeseriesResponse\",");
- assertThat(out).named("stdout").containsMatch(".*oldest.*");
- }
-}
diff --git a/monitoring/v3/README.md b/monitoring/v3/README.md
deleted file mode 100644
index b7ea5622ec6..00000000000
--- a/monitoring/v3/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Cloud Monitoring Sample
-
-Simple command-line program to demonstrate connecting to the Google
-Monitoring API to retrieve API data.
-
-This also includes an example of how to create a cusom metric and
-write a TimeSeries value to it.
-
-## Prerequisites to run locally:
-
- * [Maven 3](https://maven.apache.org)
- * [GCloud CLI](https://cloud.google.com/sdk/gcloud/)
- * Create a Cloud project
-
-# Set Up Your Local Dev Environment
-
-Create local credentials by running the following command and following the oauth2 flow:
-
- gcloud beta auth application-default login
-
-To run:
-
- * `mvn clean install`
- * `./list_resources_example.sh
- * `./run_custom_metrics.sh
-
-## Running on GCE, GAE, or other environments
-
-On Google App Engine, the credentials should be found automatically.
-
-On Google Compute Engine, the credentials should be found automatically, but require that
-you create the instance with the correct scopes.
-
- gcloud compute instances create --scopes="https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/compute,https://www.googleapis.com/auth/compute.readonly" test-instance
-
-If you did not create the instance with the right scopes, you can still upload a JSON service
-account and set GOOGLE_APPLICATION_CREDENTIALS as described below.
-
-## Using a Service Account
-
-In non-Google Cloud environments, GCE instances created without the correct scopes, or local
-workstations if the `gcloud beta auth application-default login` command fails, use a Service
-Account by doing the following:
-
-* Go to API Manager -> Credentials
-* Click 'New Credentials', and create a Service Account or [click here](https://console.cloud.google
-.com/project/_/apiui/credential/serviceaccount)
- Download the JSON for this service account, and set the `GOOGLE_APPLICATION_CREDENTIALS`
- environment variable to point to the file containing the JSON credentials.
-
-
- export GOOGLE_APPLICATION_CREDENTIALS=~/Downloads/-0123456789abcdef.json
-
-## Run Tests
-
-The tests emulate what the scripts accomplish, so there isn't a reason why they
-need to be run if the examples work. However, if you'd like to run them, change
-`TEST_PROJECT_ID` in [`ListResourcesTest`](src/test/java/ListResourcesTest.java)
-to the appropriate project ID that matches the Service Account pointed to by
-`GOOGLE_APPLICATION_CREDENTIALS`, then run:
-
- mvn test -DskipTests=false
diff --git a/monitoring/v3/list_resources_example.sh b/monitoring/v3/list_resources_example.sh
deleted file mode 100755
index 7b0f63cbe0a..00000000000
--- a/monitoring/v3/list_resources_example.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-mvn exec:java -Dexec.mainClass=ListResources -Dexec.args="$1"
diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml
deleted file mode 100644
index 22ee2619c34..00000000000
--- a/monitoring/v3/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
- 4.0.0
- com.google.cloud.monotoring.samples
- cloud-monitoring-v3-samples
- 0.1-SNAPSHOT
- jar
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
-
- 1.19.0
- 1.19.0
- UTF-8
- true
-
-
-
-
- com.google.api-client
- google-api-client
- 1.22.0
-
-
- com.google.oauth-client
- google-oauth-client
- ${project.oauth.version}
-
-
- com.google.http-client
- google-http-client-jackson2
- ${project.http.version}
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- ${project.oauth.version}
-
-
- joda-time
- joda-time
- 2.9.4
-
-
- org.apache.commons
- commons-lang3
- 3.4
-
-
- com.google.apis
- google-api-services-monitoring
- v3-rev6-1.22.0
-
-
- com.google.code.gson
- gson
- 2.7
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- com.jcabi
- jcabi-matchers
- 1.3
- test
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
-
-
-
-
- maven-compiler-plugin
- 2.3.2
-
- 1.7
- 1.7
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.4.2
-
- ${skipTests}
-
-
-
-
-
-
-
diff --git a/monitoring/v3/run_custom_metrics.sh b/monitoring/v3/run_custom_metrics.sh
deleted file mode 100755
index 6c2652cfe4d..00000000000
--- a/monitoring/v3/run_custom_metrics.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-mvn exec:java -Dexec.mainClass=CreateCustomMetric -Dexec.args="$1"
diff --git a/monitoring/v3/src/main/java/CreateCustomMetric.java b/monitoring/v3/src/main/java/CreateCustomMetric.java
deleted file mode 100644
index 86047357ca0..00000000000
--- a/monitoring/v3/src/main/java/CreateCustomMetric.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-import com.google.api.services.monitoring.v3.Monitoring;
-import com.google.api.services.monitoring.v3.model.CreateTimeSeriesRequest;
-import com.google.api.services.monitoring.v3.model.LabelDescriptor;
-import com.google.api.services.monitoring.v3.model.ListMetricDescriptorsResponse;
-import com.google.api.services.monitoring.v3.model.ListTimeSeriesResponse;
-import com.google.api.services.monitoring.v3.model.Metric;
-import com.google.api.services.monitoring.v3.model.MetricDescriptor;
-import com.google.api.services.monitoring.v3.model.MonitoredResource;
-import com.google.api.services.monitoring.v3.model.Point;
-import com.google.api.services.monitoring.v3.model.TimeInterval;
-import com.google.api.services.monitoring.v3.model.TimeSeries;
-import com.google.api.services.monitoring.v3.model.TypedValue;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
-import org.joda.time.DateTime;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.TimeZone;
-
-
-/**
- * Class to demonstrate creating a custom metric with Cloud Monitoring.
- *
- *
This class provides a few functions that create a custom GAUGE metric, writes a timeseries
- * value to it, then reads that metric's value back within the last 5 minutes to see the value
- * written.
- */
-public class CreateCustomMetric {
-
- /**
- * Cloud Monitoring v3 REST client.
- */
- private Monitoring monitoringService;
-
- private static SimpleDateFormat rfc3339 =
- new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'");
-
- static {
- rfc3339.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- /**
- * Identifier for project resource, in format 'projects/your-project-id'.
- */
- private String projectResource;
-
- /**
- * All custom metrics should use this domain as their prefix.
- */
- static final String CUSTOM_METRIC_DOMAIN = "custom.googleapis.com";
-
- /**
- * Name of our custom metric to create.
- */
- static final String DEFAULT_METRIC_TYPE = "custom_measurement";
-
- /**
- * The specific metric type for the instance of this class. Defaults to DEFAULT_METRIC_TYPE.
- */
- private String metricType;
-
- /**
- * The specific metric name, which is based on the project resource and the type.
- */
- private String metricName;
-
-
- /**
- * GAUGE metrics measure a value at a point in time.
- */
- static final String METRIC_KIND = "GAUGE";
-
- /**
- * Upper bound for random number to write to metric, defaults to 10.
- */
- private int bound = 10;
-
- /**
- * Constructs an instance of the class using the default metric name.
- */
- public CreateCustomMetric(Monitoring monitoringService, String projectResource) {
- this.monitoringService = monitoringService;
- this.projectResource = projectResource;
- this.metricType = CUSTOM_METRIC_DOMAIN + "/" + DEFAULT_METRIC_TYPE;
- this.metricName = projectResource + "/metricDescriptors/" + metricType;
-
- }
-
- /**
- * Constructs an instance of the class using the default metric name, and takes in a random
- * number generaotr (used for test purposes).
- *
- *
Package-private to be accessible to tests.
- */
- CreateCustomMetric(Monitoring monitoringService, String projectResource,
- String metricName, int bound) {
- this.monitoringService = monitoringService;
- this.projectResource = projectResource;
- this.metricType = CUSTOM_METRIC_DOMAIN + "/" + DEFAULT_METRIC_TYPE;
- this.metricName = projectResource + "/metricDescriptors/" + metricType;
- this.bound = bound;
- }
-
- /**
- * Constructs an instance of the class with the metric name specified.
- */
- public CreateCustomMetric(Monitoring monitoringService, String projectResource,
- String metricName) {
- this.monitoringService = monitoringService;
- this.projectResource = projectResource;
- this.metricType = CUSTOM_METRIC_DOMAIN + "/" + metricName;
- this.metricName = projectResource + "/metricDescriptors/" + metricType;
- }
-
- /**
- * Returns now in RFC3339 format. This is the end-time of the window
- * this example views the TimeSeries in.
- */
- private static String getNow() {
- DateTime dt = new DateTime();
- return rfc3339.format(dt.toDate());
- }
-
- /**
- * Returns 5 minutes before now to create a window to view timeseries in.
- */
- private static String getStartTime() {
- DateTime dt = new DateTime().minusMinutes(5);
- return rfc3339.format(dt.toDate());
- }
-
- /**
- * Dummy method to get an arbitrary data point.
- */
- private long getRandomPoint() {
- long value = new Random().nextInt(bound);
- System.out.println("Returning value " + value);
- return value;
- }
-
- /**
- * This method creates a custom metric with arbitrary names, description,
- * and units.
- *
- *
Package-private to be accessible to tests.
- */
- MetricDescriptor createCustomMetric() throws IOException {
- MetricDescriptor metricDescriptor = new MetricDescriptor();
-
-
- metricDescriptor.setName(metricName);
- metricDescriptor.setType(metricType);
-
- LabelDescriptor labelDescriptor = new LabelDescriptor();
- labelDescriptor.setKey("environment");
- labelDescriptor.setValueType("STRING");
- labelDescriptor.setDescription("An arbitrary measurement.");
- labelDescriptor.setDescription("Custom Metric");
- List labelDescriptorList = new ArrayList();
- labelDescriptorList.add(labelDescriptor);
- metricDescriptor.setLabels(labelDescriptorList);
-
- metricDescriptor.setMetricKind(METRIC_KIND);
- metricDescriptor.setValueType("INT64");
- // Fake custom metric with unit 'items'
- metricDescriptor.setUnit("items");
-
-
- MetricDescriptor descriptorResponse = this.monitoringService.projects()
- .metricDescriptors()
- .create(projectResource, metricDescriptor)
- .execute();
- System.out.println("create response" + descriptorResponse.toPrettyString());
- return descriptorResponse;
-
- }
-
- /**
- * Retrieve the custom metric created by createCustomMetric.
- *
- *
It can sometimes take a few moments before a new custom metric is ready to have
- * TimeSeries written to it, so this method is used
- * to check when it is ready.
- */
- public MetricDescriptor getCustomMetric() throws IOException {
- Monitoring.Projects.MetricDescriptors.List metrics =
- monitoringService.projects().metricDescriptors()
- .list(projectResource);
- metrics.setFilter("metric.type=\"" + metricType + "\"");
- ListMetricDescriptorsResponse response = metrics.execute();
- List descriptors = response.getMetricDescriptors();
- System.out.println("reading custom metric");
- if (descriptors == null || descriptors.isEmpty()) {
- System.out.println("No metric descriptor matching that label found.");
- return null;
- } else {
- System.out.println(descriptors.get(0).toPrettyString());
- return descriptors.get(0);
- }
- }
-
- /**
- * Writes a timeseries value for the custom metric created.
- *
The value written is a random integer value for demonstration purposes. It's a GAUGE metric,
- * which means its a measure of a value at a point in time, and thus the start
- * window and end window times are the same.
- *
- * @throws IOException On network error.
- */
- void writeCustomMetricTimeseriesValue() throws IOException {
- Map metricLabel = ImmutableMap.of(
- "environment", "STAGING"
- );
- Map resourceLabel = ImmutableMap.of(
- "instance_id", "test-instance",
- "zone", "us-central1-f"
- );
-
- CreateTimeSeriesRequest timeSeriesRequest = new CreateTimeSeriesRequest();
- TimeSeries timeSeries = new TimeSeries();
-
- Metric metric = new Metric();
- metric.setType(metricType);
-
- metric.setLabels(metricLabel);
- timeSeries.setMetric(metric);
- MonitoredResource monitoredResource = new MonitoredResource();
- monitoredResource.setType("gce_instance");
- monitoredResource.setLabels(resourceLabel);
- timeSeries.setResource(monitoredResource);
- timeSeries.setMetricKind(METRIC_KIND);
- timeSeries.setValueType("INT64");
- Point point = new Point();
- TimeInterval ti = new TimeInterval();
- String now = getNow();
- ti.setStartTime(now);
- ti.setEndTime(now);
-
- point.setInterval(ti);
- point.setValue(new TypedValue().setInt64Value(getRandomPoint()));
-
- timeSeries.setPoints(Lists.newArrayList(point));
-
- timeSeriesRequest.setTimeSeries(Lists.newArrayList(timeSeries));
- monitoringService.projects().timeSeries().create(projectResource, timeSeriesRequest).execute();
- }
-
- /**
- * Read the TimeSeries value for the custom metrics created within a window of the
- * last 5 minutes.
- *
- * @return The TimeSeries response object reflecting the Timeseries of the custom metrics
- * for the last 5 minutes.
- * @throws IOException On network error.
- */
- ListTimeSeriesResponse readTimeseriesValue() throws IOException {
- ListTimeSeriesResponse response =
- monitoringService.projects().timeSeries().list(projectResource)
- .setFilter("metric.type=\"" + metricType + "\"")
- .setPageSize(3)
- .setIntervalStartTime(getStartTime())
- .setIntervalEndTime(getNow())
- .execute();
- return response;
- }
-
- /**
- * Use the Google Cloud Monitoring API to create a custom metric.
- *
- * @param args The first arg should be the project name you'd like to inspect.
- * @throws Exception if something goes wrong.
- */
- public static void main(final String[] args) throws Exception {
- if (args.length != 1) {
- System.err.println(String.format("Usage: %s ",
- CreateCustomMetric.class.getSimpleName()));
- return;
- }
-
- String project = args[0];
- String projectResource = "projects/" + project;
-
-
- // Create an authorized API client
- Monitoring monitoringService = ListResources.authenticate();
-
- CreateCustomMetric metricWriter =
- new CreateCustomMetric(monitoringService, projectResource);
-
- MetricDescriptor metricDescriptor = metricWriter.createCustomMetric();
-
- System.out.println("listMetricDescriptors response");
- System.out.println(metricDescriptor.toPrettyString());
-
- // wait until custom metric can be read back
- while (metricWriter.getCustomMetric() == null) {
- Thread.sleep(2000);
- }
- metricWriter.writeCustomMetricTimeseriesValue();
- Thread.sleep(3000);
- ListTimeSeriesResponse response = metricWriter.readTimeseriesValue();
- System.out.println("reading custom metric timeseries");
- System.out.println(response.toPrettyString());
-
- }
-}
diff --git a/monitoring/v3/src/main/java/ListResources.java b/monitoring/v3/src/main/java/ListResources.java
deleted file mode 100644
index 859e635f7c9..00000000000
--- a/monitoring/v3/src/main/java/ListResources.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-// [START all]
-
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.monitoring.v3.Monitoring;
-import com.google.api.services.monitoring.v3.MonitoringScopes;
-import com.google.api.services.monitoring.v3.model.ListMetricDescriptorsResponse;
-import com.google.api.services.monitoring.v3.model.ListMonitoredResourceDescriptorsResponse;
-import com.google.api.services.monitoring.v3.model.ListTimeSeriesResponse;
-
-import org.joda.time.DateTime;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.security.GeneralSecurityException;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
-
-/**
- * Simple command-line program to demonstrate connecting to and retrieving data
- * from the Google Cloud Monitoring API v3 using application default credentials.
- */
-public class ListResources {
-
- /**
- * The metric that we want to fetch.
- */
- private static final String METRIC =
- "compute.googleapis.com/instance/cpu/usage_time";
-
- /**
- * This test program prints to standard output, but the integration tests verify
- * the output with a custom output stream.
- */
- private PrintStream outputStream;
-
- /**
- * Cloud Monitoring v3 REST client.
- */
- private Monitoring monitoringService;
-
- /**
- * Identifier for project resource, in format 'projects/your-project-id'.
- */
- private String projectResource;
-
- /**
- * Utility class doesn't need to be instantiated.
- */
- private ListResources(Monitoring monitoringService, String projectResource) {
- this.monitoringService = monitoringService;
- this.projectResource = projectResource;
- this.outputStream = System.out;
- }
-
- /**
- * Package private that accepts output stream for integration test.
- */
- ListResources(Monitoring monitoringService, String projectResource, PrintStream os) {
- this.monitoringService = monitoringService;
- this.projectResource = projectResource;
- this.outputStream = os;
- }
-
- private static SimpleDateFormat rfc3339 =
- new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'");
-
- static {
- rfc3339.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- /**
- * Query the projects.monitoredResourceDescriptors.list API method.
- *
- *
This lists all the resources available to be monitored in the API.
- *
- *
Package-private to be accessible to tests.
- */
- void listMonitoredResourceDescriptors() throws IOException {
- ListMonitoredResourceDescriptorsResponse monitoredResources =
- this.monitoringService.projects()
- .monitoredResourceDescriptors().list(this.projectResource).execute();
- this.outputStream.println("listMonitoredResourceDescriptors response");
- this.outputStream.println(monitoredResources.toPrettyString());
- }
-
- /**
- * Query to MetricDescriptors.list
- *
This lists all the current metrics. Package-private to be accessible to tests.
- */
- void listMetricDescriptors() throws IOException {
- ListMetricDescriptorsResponse metricsResponse =
- this.monitoringService.projects().metricDescriptors()
- .list(this.projectResource).execute();
- this.outputStream.println("listMetricDescriptors response");
- this.outputStream.println(metricsResponse.toPrettyString());
- }
-
- /**
- * Returns start time for listTimeSeries.
- *
- * @return An hour ago - 5 minutes
- */
- private static String getStartTime() {
- // Return an hour ago - 5 minutes
- DateTime dt = new DateTime().minusHours(1).minusMinutes(5);
- rfc3339.format(dt.toDate());
- return rfc3339.format(dt.toDate());
- }
-
- /**
- * Returns end time for listTimeSeries.
- *
- * @return An hour ago
- */
- private static String getEndTime() {
- // Return an hour ago
- DateTime dt = new DateTime().minusHours(1);
- return rfc3339.format(dt.toDate());
- }
-
-
- /**
- * Query to MetricDescriptors.list
- *
- *
This lists all the current metrics.
- */
- void listTimeseries() throws IOException {
- ListTimeSeriesResponse timeSeriesList = this.monitoringService.projects().timeSeries()
- .list(this.projectResource)
- .setFilter("metric.type=\"" + METRIC + "\"")
- .setPageSize(3)
- .setIntervalStartTime(getStartTime())
- .setIntervalEndTime(getEndTime())
- .execute();
- this.outputStream.println("listTimeseries response");
- this.outputStream.println(timeSeriesList.toPrettyString());
- }
-
- /**
- * Builds and returns a CloudMonitoring service object authorized with the
- * application default credentials.
- *
- * @return CloudMonitoring service object that is ready to make requests.
- * @throws GeneralSecurityException if authentication fails.
- * @throws IOException if authentication fails.
- */
- static Monitoring authenticate() throws GeneralSecurityException, IOException {
- // Grab the Application Default Credentials from the environment.
- GoogleCredential credential = GoogleCredential.getApplicationDefault()
- .createScoped(MonitoringScopes.all());
-
- // Create and return the CloudMonitoring service object
- HttpTransport httpTransport = new NetHttpTransport();
- JsonFactory jsonFactory = new JacksonFactory();
- Monitoring service = new Monitoring.Builder(httpTransport,
- jsonFactory, credential)
- .setApplicationName("Monitoring Sample")
- .build();
- return service;
- }
-
- /**
- * Query the Google Cloud Monitoring API using a service account and print the
- * result to the console.
- *
- * @param args The first arg should be the project name you'd like to inspect.
- * @throws Exception if something goes wrong.
- */
- public static void main(final String[] args) throws Exception {
- if (args.length != 1) {
- System.err.println(String.format("Usage: %s ",
- ListResources.class.getSimpleName()));
- return;
- }
-
- String project = args[0];
- String projectResource = "projects/" + project;
-
-
- // Create an authorized API client
- Monitoring monitoringService = authenticate();
-
- ListResources example = new ListResources(
- monitoringService, projectResource);
-
- example.listMonitoredResourceDescriptors();
- example.listMetricDescriptors();
- example.listTimeseries();
- }
-}
diff --git a/monitoring/v3/src/test/java/CreateCustomMetricTest.java b/monitoring/v3/src/test/java/CreateCustomMetricTest.java
deleted file mode 100644
index 301d08ed741..00000000000
--- a/monitoring/v3/src/test/java/CreateCustomMetricTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.monitoring.v3.Monitoring;
-import com.google.api.services.monitoring.v3.model.Point;
-import com.google.common.collect.ImmutableList;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-
-
-/**
- * Integration tests for the basic Cloud Monitoring v3 examples.
- *
- *
Running these tests requires that GOOGLE_APPLICATION_CREDENTIALS points to a
- * valid JSON Service Account downloaded from a project with the Cloud
- * Monitoring API enabled.
- */
-public class CreateCustomMetricTest {
-
- /**
- * Google Cloud Monitoring client to integration test.
- */
- private CreateCustomMetric underTest;
-
- /**
- * Creates the monitoring service client.
- */
- @Before
- public void setUp() throws Exception {
- Monitoring monitoringService = ListResources.authenticate();
- String projectResource = "projects/" + ListResourcesTest.TEST_PROJECT_ID;
- String name = RandomStringUtils.randomAlphanumeric(20).toUpperCase();
- underTest = new CreateCustomMetric(monitoringService, projectResource, name, 1);
- }
-
- /**
- * Tests that the value written for a custom metric can be read back correctly.
- */
- @Test
- public void testValueRead() throws Exception {
- underTest.createCustomMetric();
-
- while (underTest.getCustomMetric() == null) {
- Thread.sleep(2000);
- }
- underTest.writeCustomMetricTimeseriesValue();
- // give time for write to register
- Thread.sleep(2000);
- List response =
- underTest.readTimeseriesValue().getTimeSeries().get(0).getPoints();
-
- ImmutableList.Builder timeSeries = ImmutableList.builder();
- for (Point p : response) {
- timeSeries.add(p.getValue().getInt64Value());
- }
- assertThat(timeSeries.build()).contains(0L);
- }
-
-}
diff --git a/monitoring/v3/src/test/java/ListResourcesTest.java b/monitoring/v3/src/test/java/ListResourcesTest.java
deleted file mode 100644
index e8415d76ad4..00000000000
--- a/monitoring/v3/src/test/java/ListResourcesTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.api.services.monitoring.v3.Monitoring;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-
-/**
- * Integration tests for the basic Cloud Monitoring v3 examples.
- *
- *
Running these tests requires that GOOGLE_APPLICATION_CREDENTIALS points to a
- * valid JSON Service Account downloaded from a project with the Cloud
- * Monitoring API enabled.
- */
-public class ListResourcesTest {
-
- /**
- * The project ID of the project created for the integration tests.
- */
- public static final String TEST_PROJECT_ID = "cloud-samples-tests";
-
- /**
- * Google Cloud Monitoring client to integration test.
- */
- private ListResources underTest;
-
- /**
- * Output stream to capture output and verify expected output.
- */
- private ByteArrayOutputStream os;
-
- @Before
- public void setUp() throws Exception {
- Monitoring monitoringService = ListResources.authenticate();
- os = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(os);
- String projectResource = "projects/" + TEST_PROJECT_ID;
- underTest = new ListResources(monitoringService, projectResource, ps);
- }
-
- /**
- * Integration tests that tests that getting the monitored resource returns
- * the expected strings.
- */
- @Test
- public void testListMonitoredResourceDescriptors() throws Exception {
- this.underTest.listMonitoredResourceDescriptors();
- String result = new String(os.toByteArray());
- assertThat(result)
- .named("output text stream")
- .contains("An application running in Google App Engine");
- }
-
- /**
- * Integration tests that tests that getting the metric returns
- * the expected strings.
- */
- @Test
- public void testListMetrics() throws Exception {
- this.underTest.listMetricDescriptors();
- String result = new String(os.toByteArray());
- assertThat(result)
- .named("output text stream")
- .contains("Delta CPU usage time. Units are second");
- }
-
- /**
- * Integration tests that tests that getting time series returns
- * the expected strings.
- */
- @Test
- public void testListTimeseries() throws Exception {
- this.underTest.listTimeseries();
- String result = new String(os.toByteArray());
- assertThat(result)
- .named("output text stream")
- .contains("listTimeseries response");
- }
-}
diff --git a/speech/README.md b/speech/README.md
deleted file mode 100644
index e6e4b640430..00000000000
--- a/speech/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Cloud Speech API samples for Java
-
-This directory contains several samples for the [Cloud Speech API](https://cloud.google.com/speech/)
-with Java.
-
-- [grpc](grpc)
-
- A sample for accessing Cloud Speech streaming and non streaming apis with [gRPC](http://www.grpc.io/).
diff --git a/speech/grpc/README.md b/speech/grpc/README.md
deleted file mode 100644
index f0f1063d99a..00000000000
--- a/speech/grpc/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Cloud Speech API gRPC samples for Java
-
-This is a sample repo for accessing the [Google Cloud Speech API](http://cloud.google.com/speech) with
-[gRPC](http://www.grpc.io/) client library. Note that these samples are for `advanced users` and is in
-BETA. Please see [Google Cloud Platform Launch Stages](https://cloud.google.com/terms/launch-stages).
-
-## Prerequisites
-
-### Enable the Speech API
-
-If you have not already done so, [enable the Google Cloud Speech API for your project](https://console.developers.google.com/apis/api/speech.googleapis.com/overview).
-You must be whitelisted to do this.
-
-
-### Download and install Java and Maven
-
-Install [Java7 or
-higher](http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html).
-
-This sample uses the [Apache Maven][maven] build system. Before getting started, be
-sure to [download][maven-download] and [install][maven-install] it. When you use
-Maven as described here, it will automatically download the needed client
-libraries.
-
-[maven]: https://maven.apache.org
-[maven-download]: https://maven.apache.org/download.cgi
-[maven-install]: https://maven.apache.org/install.html
-
-
-### Set Up to Authenticate With Your Project's Credentials
-
-The example uses a service account for OAuth2 authentication.
-So next, set up to authenticate with the Speech API using your project's
-service account credentials.
-
-Visit the [Cloud Console](https://console.developers.google.com), and navigate to:
-`API Manager > Credentials > Create credentials >
-Service account key > New service account`.
-Create a new service account, and download the json credentials file.
-
-Then, set
-the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to point to your
-downloaded service account credentials before running this example:
-
- export GOOGLE_APPLICATION_CREDENTIALS=/path/to/your/credentials-key.json
-
-If you do not do this, you will see an error that looks something like this when
-you run the example scripts:
-`WARNING: RPC failed: Status{code=PERMISSION_DENIED, description=Request had insufficient authentication scopes., cause=null}`.
-See the
-[Cloud Platform Auth Guide](https://cloud.google.com/docs/authentication#developer_workflow)
-for more information.
-
-## Build the application
-
-Then, build the program:
-
-```sh
-$ mvn package
-```
-
-or
-
-```sh
-$ mvn compile
-$ mvn assembly:single
-```
-
-## Run the clients
-
-These programs return the transcription of the audio file you provided. Please
-note that the audio file must be in RAW format. You can use `sox`
-(available, e.g. via [http://sox.sourceforge.net/](http://sox.sourceforge.net/)
-or [homebrew](http://brew.sh/)) to convert audio files to raw format.
-
-### Run the sync client
-
-To use the sync method to transcribe a 16,000Hz sample audio file, run the following:
-
-```sh
-$ bin/speech-sample-sync.sh --host=speech.googleapis.com --port=443 \
---uri=resources/audio.raw --sampling=16000
-```
-
-### Run the async client
-
-To use the async method to transcribe a 16,000Hz sample audio file, run the following:
-
-```sh
-$ bin/speech-sample-async.sh --host=speech.googleapis.com --port=443 \
---uri=resources/audio.raw --sampling=16000
-```
-
-### Run the streaming client
-
-To use the streaming method to transcribe a 16,000Hz sample audio file, run the following:
-
-```sh
-$ bin/speech-sample-streaming.sh --host=speech.googleapis.com --port=443 \
---file=resources/audio.raw --sampling=16000
-```
-
diff --git a/speech/grpc/bin/speech-sample-async.sh b/speech/grpc/bin/speech-sample-async.sh
deleted file mode 100755
index be843b1b4e0..00000000000
--- a/speech/grpc/bin/speech-sample-async.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-SRC_DIR="$( cd "$( dirname "$0" )/.." && pwd )"
-java -cp "${SRC_DIR}/target/grpc-sample-1.0-jar-with-dependencies.jar" \
- com.examples.cloud.speech.AsyncRecognizeClient "$@"
diff --git a/speech/grpc/bin/speech-sample-streaming.sh b/speech/grpc/bin/speech-sample-streaming.sh
deleted file mode 100755
index 8fc77e6afaf..00000000000
--- a/speech/grpc/bin/speech-sample-streaming.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-SRC_DIR="$( cd "$( dirname "$0" )/.." && pwd )"
-java -cp "${SRC_DIR}/target/grpc-sample-1.0-jar-with-dependencies.jar" \
- com.examples.cloud.speech.StreamingRecognizeClient "$@"
diff --git a/speech/grpc/bin/speech-sample-sync.sh b/speech/grpc/bin/speech-sample-sync.sh
deleted file mode 100755
index 322d11af2cb..00000000000
--- a/speech/grpc/bin/speech-sample-sync.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# 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.
-
-SRC_DIR="$( cd "$( dirname "$0" )/.." && pwd )"
-java -cp "${SRC_DIR}/target/grpc-sample-1.0-jar-with-dependencies.jar" \
- com.examples.cloud.speech.SyncRecognizeClient "$@"
diff --git a/speech/grpc/pom.xml b/speech/grpc/pom.xml
deleted file mode 100644
index 0e05f3a7f55..00000000000
--- a/speech/grpc/pom.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-
-
- 4.0.0
-
- com.google.cloud.speech
- grpc-sample
- 1.0
- jar
-
- speech-grpc-sample
- https://cloud.google.com/speech/
- 2016
-
-
-
- com.google.cloud
- shared-configuration
- 1.0.0
- ../../java-repo-tools
-
-
-
-
- Apache 2
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
-
- Google
- http://www.google.com
-
-
-
- UTF-8
-
-
-
-
- staged
-
-
- snapshots-repo
- https://oss.sonatype.org/content/repositories/snapshots
-
- false
-
-
- true
-
-
-
-
-
- jdk7
-
- 1.7
-
-
- 1.7
-
-
-
- jdk8
-
- 1.8
-
-
- 1.8
-
-
-
- fedora
-
-
- os.detected.classifier
- os.detected.release.fedora
-
-
-
- ${os.detected.classifier}-fedora
-
-
-
- non-fedora
-
-
- os.detected.classifier
- !os.detected.release.fedora
-
-
-
- ${os.detected.classifier}
-
-
-
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- commons-cli
- commons-cli
- 1.3.1
-
-
- com.google.auth
- google-auth-library-oauth2-http
- 0.4.0
-
-
-
- com.google.guava
- guava-jdk5
-
-
-
-
- com.google.guava
- guava
- 19.0
-
-
- io.grpc
- grpc-all
- 0.15.0
-
-
-
- io.netty
- netty-tcnative-boringssl-static
- 1.1.33.Fork20
- ${tcnative.classifier}
-
-
- com.google.truth
- truth
- 0.29
- test
-
-
- log4j
- log4j
- 1.2.17
-
-
-
-
-
-
-
- never
-
-
- false
-
- central
- Central Repository
- https://repo.maven.apache.org/maven2
-
-
- protoc-plugin
- https://dl.bintray.com/sergei-ivanov/maven/
-
-
-
-
-
-
- kr.motd.maven
- os-maven-plugin
- 1.4.1.Final
-
-
-
-
-
- org.xolstice.maven.plugins
- protobuf-maven-plugin
- 0.5.0
-
-
- com.google.protobuf:protoc:3.0.0-beta-2:exe:${os.detected.classifier}
- grpc-java
- ${basedir}/src/main/java/third_party
- io.grpc:protoc-gen-grpc-java:0.13.2:exe:${os.detected.classifier}
-
-
-
-
- compile
- compile-custom
-
-
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
- 2.1
-
-
- compile
-
- display-dependency-updates
-
-
-
-
-
- maven-compiler-plugin
- 3.1
-
- ${jdk.version}
- ${jdk.version}
- true
- false
- -Xlint:-options
-
-
-
- maven-assembly-plugin
-
-
- jar-with-dependencies
-
-
-
-
- simple-command
- package
-
- attached
-
-
-
-
-
-
-
-
-
diff --git a/speech/grpc/resources/audio.raw b/speech/grpc/resources/audio.raw
deleted file mode 100644
index 5ebf79d3c9c..00000000000
Binary files a/speech/grpc/resources/audio.raw and /dev/null differ
diff --git a/speech/grpc/resources/audio32KHz.raw b/speech/grpc/resources/audio32KHz.raw
deleted file mode 100644
index 6b52fc326f8..00000000000
Binary files a/speech/grpc/resources/audio32KHz.raw and /dev/null differ
diff --git a/speech/grpc/src/main/java/com/examples/cloud/speech/AsyncRecognizeClient.java b/speech/grpc/src/main/java/com/examples/cloud/speech/AsyncRecognizeClient.java
deleted file mode 100644
index 7b74cd96d4f..00000000000
--- a/speech/grpc/src/main/java/com/examples/cloud/speech/AsyncRecognizeClient.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.cloud.speech.v1beta1.AsyncRecognizeRequest;
-import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse;
-import com.google.cloud.speech.v1beta1.RecognitionAudio;
-import com.google.cloud.speech.v1beta1.RecognitionConfig;
-import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
-import com.google.cloud.speech.v1beta1.SpeechGrpc;
-import com.google.longrunning.GetOperationRequest;
-import com.google.longrunning.Operation;
-import com.google.longrunning.OperationsGrpc;
-
-import io.grpc.ManagedChannel;
-import io.grpc.StatusRuntimeException;
-import io.grpc.auth.ClientAuthInterceptor;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Client that sends audio to Speech.AsyncRecognize and returns transcript.
- */
-public class AsyncRecognizeClient {
-
- private static final Logger logger = Logger.getLogger(AsyncRecognizeClient.class.getName());
-
- private static final List OAUTH2_SCOPES =
- Arrays.asList("https://www.googleapis.com/auth/cloud-platform");
-
- private final URI input;
- private final int samplingRate;
-
- private final ManagedChannel channel;
- private final SpeechGrpc.SpeechBlockingStub speechClient;
- private final OperationsGrpc.OperationsBlockingStub statusClient;
-
- /**
- * Construct client connecting to Cloud Speech server at {@code host:port}.
- */
- public AsyncRecognizeClient(ManagedChannel channel, URI input, int samplingRate)
- throws IOException {
- this.input = input;
- this.samplingRate = samplingRate;
- this.channel = channel;
-
- speechClient = SpeechGrpc.newBlockingStub(channel);
- statusClient = OperationsGrpc.newBlockingStub(channel);
- }
-
- public void shutdown() throws InterruptedException {
- channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
- }
-
- public static ManagedChannel createChannel(String host, int port) throws IOException {
- GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
- creds = creds.createScoped(OAUTH2_SCOPES);
- ManagedChannel channel =
- NettyChannelBuilder.forAddress(host, port)
- .negotiationType(NegotiationType.TLS)
- .intercept(new ClientAuthInterceptor(creds, Executors.newSingleThreadExecutor()))
- .build();
-
- return channel;
- }
-
- /**
- * Sends a request to the speech API and returns an Operation handle.
- */
- public void recognize() {
- RecognitionAudio audio;
- try {
- audio = RecognitionAudioFactory.createRecognitionAudio(this.input);
- } catch (IOException e) {
- logger.log(Level.WARNING, "Failed to read audio uri input: " + input);
- return;
- }
- logger.info("Sending " + audio.getContent().size() + " bytes from audio uri input: " + input);
- RecognitionConfig config =
- RecognitionConfig.newBuilder()
- .setEncoding(AudioEncoding.LINEAR16)
- .setSampleRate(samplingRate)
- .build();
- AsyncRecognizeRequest request =
- AsyncRecognizeRequest.newBuilder().setConfig(config).setAudio(audio).build();
-
- Operation operation;
- Operation status;
- try {
- operation = speechClient.asyncRecognize(request);
-
- // Print the long running operation handle
- logger.log(
- Level.INFO,
- String.format("Operation handle: %s, URI: %s", operation.getName(), input.toString()));
- } catch (StatusRuntimeException e) {
- logger.log(Level.WARNING, "RPC failed: {0}", e.getStatus());
- return;
- }
-
- while (true) {
- try {
- logger.log(Level.INFO, "Waiting 2s for operation, {0} processing...", operation.getName());
- Thread.sleep(2000);
- GetOperationRequest operationReq =
- GetOperationRequest.newBuilder().setName(operation.getName()).build();
- status =
- statusClient.getOperation(
- GetOperationRequest.newBuilder().setName(operation.getName()).build());
-
- if (status.getDone()) {
- break;
- }
- } catch (Exception ex) {
- logger.log(Level.WARNING, ex.getMessage());
- }
- }
-
- try {
- AsyncRecognizeResponse asyncRes = status.getResponse().unpack(AsyncRecognizeResponse.class);
-
- logger.info("Received response: " + asyncRes);
- } catch (com.google.protobuf.InvalidProtocolBufferException ex) {
- logger.log(Level.WARNING, "Unpack error, {0}", ex.getMessage());
- }
- }
-
- public static void main(String[] args) throws Exception {
-
- String audioFile = "";
- String host = "speech.googleapis.com";
- Integer port = 443;
- Integer sampling = 16000;
-
- CommandLineParser parser = new DefaultParser();
-
- Options options = new Options();
- options.addOption(
- OptionBuilder.withLongOpt("uri")
- .withDescription("path to audio uri")
- .hasArg()
- .withArgName("FILE_PATH")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("host")
- .withDescription("endpoint for api, e.g. speech.googleapis.com")
- .hasArg()
- .withArgName("ENDPOINT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("port")
- .withDescription("SSL port, usually 443")
- .hasArg()
- .withArgName("PORT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("sampling")
- .withDescription("Sampling Rate, i.e. 16000")
- .hasArg()
- .withArgName("RATE")
- .create());
-
- try {
- CommandLine line = parser.parse(options, args);
- if (line.hasOption("uri")) {
- audioFile = line.getOptionValue("uri");
- } else {
- System.err.println("An Audio uri must be specified (e.g. file:///foo/baz.raw).");
- System.exit(1);
- }
-
- if (line.hasOption("host")) {
- host = line.getOptionValue("host");
- } else {
- System.err.println("An API enpoint must be specified (typically speech.googleapis.com).");
- System.exit(1);
- }
-
- if (line.hasOption("port")) {
- port = Integer.parseInt(line.getOptionValue("port"));
- } else {
- System.err.println("An SSL port must be specified (typically 443).");
- System.exit(1);
- }
-
- if (line.hasOption("sampling")) {
- sampling = Integer.parseInt(line.getOptionValue("sampling"));
- } else {
- System.err.println("An Audio sampling rate must be specified.");
- System.exit(1);
- }
- } catch (ParseException exp) {
- System.err.println("Unexpected exception:" + exp.getMessage());
- System.exit(1);
- }
-
- ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
-
- AsyncRecognizeClient client =
- new AsyncRecognizeClient(channel, URI.create(audioFile), sampling);
- try {
- client.recognize();
- } finally {
- client.shutdown();
- }
- }
-}
diff --git a/speech/grpc/src/main/java/com/examples/cloud/speech/RecognitionAudioFactory.java b/speech/grpc/src/main/java/com/examples/cloud/speech/RecognitionAudioFactory.java
deleted file mode 100644
index 2f340b94fb4..00000000000
--- a/speech/grpc/src/main/java/com/examples/cloud/speech/RecognitionAudioFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import com.google.cloud.speech.v1beta1.RecognitionAudio;
-import com.google.protobuf.ByteString;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/*
- * RecognitionAudioFactory takes a URI as an input and creates a RecognitionAudio.
- * The URI can point to a local file or a file on Google Cloud Storage.
- */
-public class RecognitionAudioFactory {
-
- private static final String FILE_SCHEME = "file";
- private static final String GS_SCHEME = "gs";
-
- /**
- * Takes an input URI of form $scheme:// and converts to audio request.
- *
- * @param uri input uri
- * @return RecognitionAudio recognition audio
- */
- public static RecognitionAudio createRecognitionAudio(URI uri) throws IOException {
- if (uri.getScheme() == null) {
- uri = new File(uri.toString()).toURI();
- Path path = Paths.get(uri);
- return audioFromBytes(Files.readAllBytes(path));
- } else if (uri.getScheme().equals(FILE_SCHEME)) {
- Path path = Paths.get(uri);
- return audioFromBytes(Files.readAllBytes(path));
- } else if (uri.getScheme().equals(GS_SCHEME)) {
- return RecognitionAudio.newBuilder().setUri(uri.toString()).build();
- }
- throw new RuntimeException("scheme not supported " + uri.getScheme());
- }
-
- /**
- * Convert bytes to RecognitionAudio.
- *
- * @param bytes input bytes
- * @return RecognitionAudio recognition audio
- */
- private static RecognitionAudio audioFromBytes(byte[] bytes) {
- return RecognitionAudio.newBuilder().setContent(ByteString.copyFrom(bytes)).build();
- }
-}
diff --git a/speech/grpc/src/main/java/com/examples/cloud/speech/StreamingRecognizeClient.java b/speech/grpc/src/main/java/com/examples/cloud/speech/StreamingRecognizeClient.java
deleted file mode 100644
index a302f2415c4..00000000000
--- a/speech/grpc/src/main/java/com/examples/cloud/speech/StreamingRecognizeClient.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import static org.apache.log4j.ConsoleAppender.SYSTEM_OUT;
-
-import com.google.cloud.speech.v1beta1.RecognitionConfig;
-import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
-import com.google.cloud.speech.v1beta1.SpeechGrpc;
-import com.google.cloud.speech.v1beta1.StreamingRecognitionConfig;
-import com.google.cloud.speech.v1beta1.StreamingRecognizeRequest;
-import com.google.cloud.speech.v1beta1.StreamingRecognizeResponse;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.TextFormat;
-
-import io.grpc.ManagedChannel;
-import io.grpc.stub.StreamObserver;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-
-/**
- * Client that sends streaming audio to Speech.Recognize and returns streaming transcript.
- */
-public class StreamingRecognizeClient {
-
- private final String file;
- private final int samplingRate;
-
- private static final Logger logger = Logger.getLogger(StreamingRecognizeClient.class.getName());
-
- private final ManagedChannel channel;
-
- private final SpeechGrpc.SpeechStub speechClient;
-
- private static final int BYTES_PER_BUFFER = 3200; //buffer size in bytes
- private static final int BYTES_PER_SAMPLE = 2; //bytes per sample for LINEAR16
-
- private static final List OAUTH2_SCOPES =
- Arrays.asList("https://www.googleapis.com/auth/cloud-platform");
-
- /**
- * Construct client connecting to Cloud Speech server at {@code host:port}.
- */
- public StreamingRecognizeClient(ManagedChannel channel, String file, int samplingRate)
- throws IOException {
- this.file = file;
- this.samplingRate = samplingRate;
- this.channel = channel;
-
- speechClient = SpeechGrpc.newStub(channel);
-
- //Send log4j logs to Console
- //If you are going to run this on GCE, you might wish to integrate with gcloud-java logging.
- //See https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/README.md#stackdriver-logging-alpha
-
- ConsoleAppender appender = new ConsoleAppender(new SimpleLayout(), SYSTEM_OUT);
- logger.addAppender(appender);
- }
-
- public void shutdown() throws InterruptedException {
- channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
- }
-
- /** Send streaming recognize requests to server. */
- public void recognize() throws InterruptedException, IOException {
- final CountDownLatch finishLatch = new CountDownLatch(1);
- StreamObserver responseObserver =
- new StreamObserver() {
- @Override
- public void onNext(StreamingRecognizeResponse response) {
- logger.info("Received response: " + TextFormat.printToString(response));
- }
-
- @Override
- public void onError(Throwable error) {
- logger.log(Level.WARN, "recognize failed: {0}", error);
- finishLatch.countDown();
- }
-
- @Override
- public void onCompleted() {
- logger.info("recognize completed.");
- finishLatch.countDown();
- }
- };
-
- StreamObserver requestObserver =
- speechClient.streamingRecognize(responseObserver);
- try {
- // Build and send a StreamingRecognizeRequest containing the parameters for
- // processing the audio.
- RecognitionConfig config =
- RecognitionConfig.newBuilder()
- .setEncoding(AudioEncoding.LINEAR16)
- .setSampleRate(samplingRate)
- .build();
- StreamingRecognitionConfig streamingConfig =
- StreamingRecognitionConfig.newBuilder()
- .setConfig(config)
- .setInterimResults(true)
- .setSingleUtterance(true)
- .build();
-
- StreamingRecognizeRequest initial =
- StreamingRecognizeRequest.newBuilder().setStreamingConfig(streamingConfig).build();
- requestObserver.onNext(initial);
-
- // Open audio file. Read and send sequential buffers of audio as additional RecognizeRequests.
- FileInputStream in = new FileInputStream(new File(file));
- // For LINEAR16 at 16000 Hz sample rate, 3200 bytes corresponds to 100 milliseconds of audio.
- byte[] buffer = new byte[BYTES_PER_BUFFER];
- int bytesRead;
- int totalBytes = 0;
- int samplesPerBuffer = BYTES_PER_BUFFER / BYTES_PER_SAMPLE;
- int samplesPerMillis = samplingRate / 1000;
-
- while ((bytesRead = in.read(buffer)) != -1) {
- totalBytes += bytesRead;
- StreamingRecognizeRequest request =
- StreamingRecognizeRequest.newBuilder()
- .setAudioContent(ByteString.copyFrom(buffer, 0, bytesRead))
- .build();
- requestObserver.onNext(request);
- // To simulate real-time audio, sleep after sending each audio buffer.
- Thread.sleep(samplesPerBuffer / samplesPerMillis);
- }
- logger.info("Sent " + totalBytes + " bytes from audio file: " + file);
- } catch (RuntimeException e) {
- // Cancel RPC.
- requestObserver.onError(e);
- throw e;
- }
- // Mark the end of requests.
- requestObserver.onCompleted();
-
- // Receiving happens asynchronously.
- finishLatch.await(1, TimeUnit.MINUTES);
- }
-
- public static void main(String[] args) throws Exception {
-
- String audioFile = "";
- String host = "speech.googleapis.com";
- Integer port = 443;
- Integer sampling = 16000;
-
- CommandLineParser parser = new DefaultParser();
-
- Options options = new Options();
- options.addOption(
- OptionBuilder.withLongOpt("file")
- .withDescription("path to audio file")
- .hasArg()
- .withArgName("FILE_PATH")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("host")
- .withDescription("endpoint for api, e.g. speech.googleapis.com")
- .hasArg()
- .withArgName("ENDPOINT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("port")
- .withDescription("SSL port, usually 443")
- .hasArg()
- .withArgName("PORT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("sampling")
- .withDescription("Sampling Rate, i.e. 16000")
- .hasArg()
- .withArgName("RATE")
- .create());
-
- try {
- CommandLine line = parser.parse(options, args);
- if (line.hasOption("file")) {
- audioFile = line.getOptionValue("file");
- } else {
- System.err.println("An Audio file must be specified (e.g. /foo/baz.raw).");
- System.exit(1);
- }
-
- if (line.hasOption("host")) {
- host = line.getOptionValue("host");
- } else {
- System.err.println("An API enpoint must be specified (typically speech.googleapis.com).");
- System.exit(1);
- }
-
- if (line.hasOption("port")) {
- port = Integer.parseInt(line.getOptionValue("port"));
- } else {
- System.err.println("An SSL port must be specified (typically 443).");
- System.exit(1);
- }
-
- if (line.hasOption("sampling")) {
- sampling = Integer.parseInt(line.getOptionValue("sampling"));
- } else {
- System.err.println("An Audio sampling rate must be specified.");
- System.exit(1);
- }
- } catch (ParseException exp) {
- System.err.println("Unexpected exception:" + exp.getMessage());
- System.exit(1);
- }
-
- ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
- StreamingRecognizeClient client = new StreamingRecognizeClient(channel, audioFile, sampling);
- try {
- client.recognize();
- } finally {
- client.shutdown();
- }
- }
-}
diff --git a/speech/grpc/src/main/java/com/examples/cloud/speech/SyncRecognizeClient.java b/speech/grpc/src/main/java/com/examples/cloud/speech/SyncRecognizeClient.java
deleted file mode 100644
index 88d634a8f65..00000000000
--- a/speech/grpc/src/main/java/com/examples/cloud/speech/SyncRecognizeClient.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import com.google.cloud.speech.v1beta1.RecognitionAudio;
-import com.google.cloud.speech.v1beta1.RecognitionConfig;
-import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
-import com.google.cloud.speech.v1beta1.SpeechGrpc;
-import com.google.cloud.speech.v1beta1.SyncRecognizeRequest;
-import com.google.cloud.speech.v1beta1.SyncRecognizeResponse;
-import com.google.protobuf.TextFormat;
-
-import io.grpc.ManagedChannel;
-import io.grpc.StatusRuntimeException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Client that sends audio to Speech.SyncRecognize and returns transcript.
- */
-public class SyncRecognizeClient {
-
- private static final Logger logger = Logger.getLogger(SyncRecognizeClient.class.getName());
-
- private static final List OAUTH2_SCOPES =
- Arrays.asList("https://www.googleapis.com/auth/cloud-platform");
-
- private final URI input;
- private final int samplingRate;
-
- private final ManagedChannel channel;
- private final SpeechGrpc.SpeechBlockingStub speechClient;
-
- /**
- * Construct client connecting to Cloud Speech server at {@code host:port}.
- */
- public SyncRecognizeClient(ManagedChannel channel, URI input, int samplingRate)
- throws IOException {
- this.input = input;
- this.samplingRate = samplingRate;
- this.channel = channel;
-
- speechClient = SpeechGrpc.newBlockingStub(channel);
- }
-
- private RecognitionAudio createRecognitionAudio() throws IOException {
- return RecognitionAudioFactory.createRecognitionAudio(this.input);
- }
-
- public void shutdown() throws InterruptedException {
- channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
- }
-
- /** Send a non-streaming-recognize request to server. */
- public void recognize() {
- RecognitionAudio audio;
- try {
- audio = createRecognitionAudio();
- } catch (IOException e) {
- logger.log(Level.WARNING, "Failed to read audio uri input: " + input);
- return;
- }
- logger.info("Sending " + audio.getContent().size() + " bytes from audio uri input: " + input);
- RecognitionConfig config =
- RecognitionConfig.newBuilder()
- .setEncoding(AudioEncoding.LINEAR16)
- .setSampleRate(samplingRate)
- .build();
- SyncRecognizeRequest request =
- SyncRecognizeRequest.newBuilder().setConfig(config).setAudio(audio).build();
-
- SyncRecognizeResponse response;
- try {
- response = speechClient.syncRecognize(request);
- } catch (StatusRuntimeException e) {
- logger.log(Level.WARNING, "RPC failed: {0}", e.getStatus());
- return;
- }
- logger.info("Received response: " + TextFormat.printToString(response));
- }
-
- public static void main(String[] args) throws Exception {
-
- String audioFile = "";
- String host = "speech.googleapis.com";
- Integer port = 443;
- Integer sampling = 16000;
-
- CommandLineParser parser = new DefaultParser();
-
- Options options = new Options();
- options.addOption(
- OptionBuilder.withLongOpt("uri")
- .withDescription("path to audio uri")
- .hasArg()
- .withArgName("FILE_PATH")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("host")
- .withDescription("endpoint for api, e.g. speech.googleapis.com")
- .hasArg()
- .withArgName("ENDPOINT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("port")
- .withDescription("SSL port, usually 443")
- .hasArg()
- .withArgName("PORT")
- .create());
- options.addOption(
- OptionBuilder.withLongOpt("sampling")
- .withDescription("Sampling Rate, i.e. 16000")
- .hasArg()
- .withArgName("RATE")
- .create());
-
- try {
- CommandLine line = parser.parse(options, args);
- if (line.hasOption("uri")) {
- audioFile = line.getOptionValue("uri");
- } else {
- System.err.println("An Audio uri must be specified (e.g. file:///foo/baz.raw).");
- System.exit(1);
- }
-
- if (line.hasOption("host")) {
- host = line.getOptionValue("host");
- } else {
- System.err.println("An API enpoint must be specified (typically speech.googleapis.com).");
- System.exit(1);
- }
-
- if (line.hasOption("port")) {
- port = Integer.parseInt(line.getOptionValue("port"));
- } else {
- System.err.println("An SSL port must be specified (typically 443).");
- System.exit(1);
- }
-
- if (line.hasOption("sampling")) {
- sampling = Integer.parseInt(line.getOptionValue("sampling"));
- } else {
- System.err.println("An Audio sampling rate must be specified.");
- System.exit(1);
- }
- } catch (ParseException exp) {
- System.err.println("Unexpected exception:" + exp.getMessage());
- System.exit(1);
- }
-
- ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
- SyncRecognizeClient client = new SyncRecognizeClient(channel, URI.create(audioFile), sampling);
- try {
- client.recognize();
- } finally {
- client.shutdown();
- }
- }
-}
diff --git a/speech/grpc/src/main/java/third_party/.gitignore b/speech/grpc/src/main/java/third_party/.gitignore
deleted file mode 100644
index 65267c8e5d7..00000000000
--- a/speech/grpc/src/main/java/third_party/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-OWNERS
-README.google
-google/internal
-google/protobuf
diff --git a/speech/grpc/src/main/java/third_party/google/api/annotations.proto b/speech/grpc/src/main/java/third_party/google/api/annotations.proto
deleted file mode 100644
index cbd18b847f3..00000000000
--- a/speech/grpc/src/main/java/third_party/google/api/annotations.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/http.proto";
-import "google/protobuf/descriptor.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "AnnotationsProto";
-option java_package = "com.google.api";
-
-extend google.protobuf.MethodOptions {
- // See `HttpRule`.
- HttpRule http = 72295728;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/api/http.proto b/speech/grpc/src/main/java/third_party/google/api/http.proto
deleted file mode 100644
index 4bbadbb76d0..00000000000
--- a/speech/grpc/src/main/java/third_party/google/api/http.proto
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.api;
-
-option java_multiple_files = true;
-option java_outer_classname = "HttpProto";
-option java_package = "com.google.api";
-
-
-// `HttpRule` defines the mapping of an RPC method to one or more HTTP
-// REST APIs. The mapping determines what portions of the request
-// message are populated from the path, query parameters, or body of
-// the HTTP request. The mapping is typically specified as an
-// `google.api.http` annotation, see "google/api/annotations.proto"
-// for details.
-//
-// The mapping consists of a field specifying the path template and
-// method kind. The path template can refer to fields in the request
-// message, as in the example below which describes a REST GET
-// operation on a resource collection of messages:
-//
-// ```proto
-// service Messaging {
-// rpc GetMessage(GetMessageRequest) returns (Message) {
-// option (google.api.http).get = "/v1/messages/{message_id}";
-// }
-// }
-// message GetMessageRequest {
-// string message_id = 1; // mapped to the URL
-// }
-// message Message {
-// string text = 1; // content of the resource
-// }
-// ```
-//
-// This definition enables an automatic, bidrectional mapping of HTTP
-// JSON to RPC. Example:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-//
-// In general, not only fields but also field paths can be referenced
-// from a path pattern. Fields mapped to the path pattern cannot be
-// repeated and must have a primitive (non-message) type.
-//
-// Any fields in the request message which are not bound by the path
-// pattern automatically become (optional) HTTP query
-// parameters. Assume the following definition of the request message:
-//
-// ```proto
-// message GetMessageRequest {
-// string message_id = 1; // mapped to the URL
-// int64 revision = 2; // becomes a parameter
-// }
-// ```
-//
-// This enables a HTTP JSON to RPC mapping as below:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456?revision=2` | `GetMessage(message_id: "123456" revision: 2)`
-//
-// Note that fields which are mapped to HTTP parameters must have a
-// primitive type or a repeated primitive type. Message types are not
-// allowed. In the case of a repeated type, the parameter can be
-// repeated in the URL, as in `...?param=A¶m=B`.
-//
-// For HTTP method kinds which allow a request body, the `body` field
-// specifies the mapping. Consider a REST update method on the
-// message resource collection:
-//
-// ```proto
-// service Messaging {
-// rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
-// option (google.api.http) = {
-// put: "/v1/messages/{message_id}"
-// body: "message"
-// }
-// }
-// message UpdateMessageRequest {
-// string message_id = 1; // mapped to the URL
-// Message message = 2; // mapped to the body
-// }
-// ```
-//
-// The following HTTP JSON to RPC mapping is enabled, where the
-// representation of the JSON in the request body is determined by
-// protos JSON encoding:
-//
-// HTTP | RPC
-// -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
-//
-// The special name `*` can be used in the body mapping to define that
-// every field not bound by the path template should be mapped to the
-// request body. This enables the following alternative definition of
-// the update method:
-//
-// ```proto
-// service Messaging {
-// rpc UpdateMessage(Message) returns (Message) {
-// option (google.api.http) = {
-// put: "/v1/messages/{message_id}"
-// body: "*"
-// }
-// }
-// message Message {
-// string message_id = 2;
-// string text = 2;
-// }
-// ```
-//
-// The following HTTP JSON to RPC mapping is enabled:
-//
-// HTTP | RPC
-// -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
-//
-// Note that when using `*` in the body mapping, it is not possible to
-// have HTTP parameters, as all fields not bound by the path end in
-// the body. This makes this option more rarely used in practice of
-// defining REST APIs. The common usage of `*` is in custom methods
-// which don't use the URL at all for transferring data.
-//
-// It is possible to define multiple HTTP methods for one RPC by using
-// the `additional_bindings` option. Example:
-//
-// ```proto
-// service Messaging {
-// rpc GetMessage(GetMessageRequest) returns (Message) {
-// option (google.api.http) = {
-// get: "/v1/messages/{message_id}"
-// additional_bindings {
-// get: "/v1/users/{user_id}/messages/{message_id}"
-// }
-// }
-// }
-// message GetMessageRequest {
-// string message_id = 1;
-// string user_id = 2;
-// }
-// ```
-//
-// This enables the following two alternative HTTP JSON to RPC
-// mappings:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")`
-//
-// # Rules for HTTP mapping
-// The rules for mapping HTTP path, query parameters, and body fields
-// to the request message are as follows:
-//
-// 1. The `body` field specifies either `*` or a field path, or is
-// omitted. If omitted, it assumes there is no HTTP body.
-// 2. Leaf fields (recursive expansion of nested messages in the
-// request) can be classified into three types:
-// (a) Matched in the URL template.
-// (b) Covered by body (if body is `*`, everything except (a) fields;
-// else everything under the body field)
-// (c) All other fields.
-// 3. URL query parameters found in the HTTP request are mapped to (c) fields.
-// 4. Any body sent with an HTTP request can contain only (b) fields.
-//
-// The syntax of the path template is as follows:
-//
-// Template = "/" Segments [ Verb ] ;
-// Segments = Segment { "/" Segment } ;
-// Segment = "*" | "**" | LITERAL | Variable ;
-// Variable = "{" FieldPath [ "=" Segments ] "}" ;
-// FieldPath = IDENT { "." IDENT } ;
-// Verb = ":" LITERAL ;
-//
-// `*` matches a single path component, `**` zero or more path components, and
-// `LITERAL` a constant. A `Variable` can match an entire path as specified
-// again by a template; this nested template must not contain further variables.
-// If no template is given with a variable, it matches a single path component.
-// The notation `{var}` is henceforth equivalent to `{var=*}`. NOTE: the field
-// paths in variables and in the `body` must not refer to repeated fields.
-//
-// Use CustomHttpPattern to specify any HTTP method that is not included in the
-// pattern field, such as HEAD, or "*" to leave the HTTP method unspecified for
-// a given URL path rule. The wild-card rule is useful for services that provide
-// content to Web (HTML) clients.
-message HttpRule {
-
- // Determines the URL pattern is matched by this rules. This pattern can be
- // used with any of the {get|put|post|delete|patch} methods. A custom method
- // can be defined using the 'custom' field.
- oneof pattern {
- // Used for listing and getting information about resources.
- string get = 2;
-
- // Used for updating a resource.
- string put = 3;
-
- // Used for creating a resource.
- string post = 4;
-
- // Used for deleting a resource.
- string delete = 5;
-
- // Used for updating a resource.
- string patch = 6;
-
- // Custom pattern is used for defining custom verbs.
- CustomHttpPattern custom = 8;
- }
-
- // The name of the request field whose value is mapped to the HTTP body, or
- // `*` for mapping all fields not captured by the path pattern to the HTTP
- // body. NOTE: the referred field must not be a repeated field.
- string body = 7;
-
- // Additional HTTP bindings for the selector. Nested bindings must
- // not contain an `additional_bindings` field themselves (that is,
- // the nesting may only be one level deep).
- repeated HttpRule additional_bindings = 11;
-}
-
-// A custom pattern is used for defining custom HTTP verb.
-message CustomHttpPattern {
- // The name of this custom HTTP verb.
- string kind = 1;
-
- // The path matched by this custom verb.
- string path = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/api/label.proto b/speech/grpc/src/main/java/third_party/google/api/label.proto
deleted file mode 100644
index 680bf119423..00000000000
--- a/speech/grpc/src/main/java/third_party/google/api/label.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.api;
-
-option java_multiple_files = true;
-option java_outer_classname = "LabelProto";
-option java_package = "com.google.api";
-
-
-// A description of a label.
-message LabelDescriptor {
- // Value types that can be used as label values.
- enum ValueType {
- // A variable-length string. This is the default.
- STRING = 0;
-
- // Boolean; true or false.
- BOOL = 1;
-
- // A 64-bit signed integer.
- INT64 = 2;
- }
-
- // The label key.
- string key = 1;
-
- // The type of data that can be assigned to the label.
- ValueType value_type = 2;
-
- // A human-readable description for the label.
- string description = 3;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/api/monitored_resource.proto b/speech/grpc/src/main/java/third_party/google/api/monitored_resource.proto
deleted file mode 100644
index 16ac9fad3c0..00000000000
--- a/speech/grpc/src/main/java/third_party/google/api/monitored_resource.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/label.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "MonitoredResourceProto";
-option java_package = "com.google.api";
-
-
-// A descriptor that describes the schema of [MonitoredResource][google.api.MonitoredResource].
-message MonitoredResourceDescriptor {
- // The monitored resource type. For example, the type `"cloudsql_database"`
- // represents databases in Google Cloud SQL.
- string type = 1;
-
- // A concise name for the monitored resource type that can be displayed in
- // user interfaces. For example, `"Google Cloud SQL Database"`.
- string display_name = 2;
-
- // A detailed description of the monitored resource type that can be used in
- // documentation.
- string description = 3;
-
- // A set of labels that can be used to describe instances of this monitored
- // resource type. For example, Google Cloud SQL databases can be labeled with
- // their `"database_id"` and their `"zone"`.
- repeated LabelDescriptor labels = 4;
-}
-
-// A monitored resource describes a resource that can be used for monitoring
-// purpose. It can also be used for logging, billing, and other purposes. Each
-// resource has a `type` and a set of `labels`. The labels contain information
-// that identifies the resource and describes attributes of it. For example,
-// you can use monitored resource to describe a normal file, where the resource
-// has `type` as `"file"`, the label `path` identifies the file, and the label
-// `size` describes the file size. The monitoring system can use a set of
-// monitored resources of files to generate file size distribution.
-message MonitoredResource {
- // The monitored resource type. This field must match the corresponding
- // [MonitoredResourceDescriptor.type][google.api.MonitoredResourceDescriptor.type] to this resource.. For example,
- // `"cloudsql_database"` represents Cloud SQL databases.
- string type = 1;
-
- // Values for some or all of the labels listed in the associated monitored
- // resource descriptor. For example, you specify a specific Cloud SQL database
- // by supplying values for both the `"database_id"` and `"zone"` labels.
- map labels = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/README.md b/speech/grpc/src/main/java/third_party/google/logging/README.md
deleted file mode 100644
index 6a414eb07b7..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Introduction
-The Google logging service.
diff --git a/speech/grpc/src/main/java/third_party/google/logging/type/http_request.proto b/speech/grpc/src/main/java/third_party/google/logging/type/http_request.proto
deleted file mode 100644
index bd28a36057c..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/type/http_request.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.type;
-
-import "google/api/annotations.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "HttpRequestProto";
-option java_package = "com.google.logging.type";
-
-
-// A common proto for logging HTTP requests.
-//
-message HttpRequest {
- // The request method. Examples: `"GET"`, `"HEAD"`, `"PUT"`, `"POST"`.
- string request_method = 1;
-
- // The scheme (http, https), the host name, the path and the query
- // portion of the URL that was requested.
- // Example: `"http://example.com/some/info?color=red"`.
- string request_url = 2;
-
- // The size of the HTTP request message in bytes, including the request
- // headers and the request body.
- int64 request_size = 3;
-
- // The response code indicating the status of response.
- // Examples: 200, 404.
- int32 status = 4;
-
- // The size of the HTTP response message sent back to the client, in bytes,
- // including the response headers and the response body.
- int64 response_size = 5;
-
- // The user agent sent by the client. Example:
- // `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET CLR 1.0.3705)"`.
- string user_agent = 6;
-
- // The IP address (IPv4 or IPv6) of the client that issued the HTTP
- // request. Examples: `"192.168.1.1"`, `"FE80::0202:B3FF:FE1E:8329"`.
- string remote_ip = 7;
-
- // The referer URL of the request, as defined in
- // [HTTP/1.1 Header Field Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html).
- string referer = 8;
-
- // Whether or not an entity was served from cache
- // (with or without validation).
- bool cache_hit = 9;
-
- // Whether or not the response was validated with the origin server before
- // being served from cache. This field is only meaningful if `cache_hit` is
- // True.
- bool validated_with_origin_server = 10;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/type/log_severity.proto b/speech/grpc/src/main/java/third_party/google/logging/type/log_severity.proto
deleted file mode 100644
index 77bdeeac981..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/type/log_severity.proto
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.type;
-
-import "google/api/annotations.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "LogSeverityProto";
-option java_package = "com.google.logging.type";
-
-
-// The severity of the event described in a log entry. These guideline severity
-// levels are ordered, with numerically smaller levels treated as less severe
-// than numerically larger levels. If the source of the log entries uses a
-// different set of severity levels, the client should select the closest
-// corresponding `LogSeverity` value. For example, Java's FINE, FINER, and
-// FINEST levels might all map to `LogSeverity.DEBUG`. If the original severity
-// code must be preserved, it can be stored in the payload.
-//
-enum LogSeverity {
- // The log entry has no assigned severity level.
- DEFAULT = 0;
-
- // Debug or trace information.
- DEBUG = 100;
-
- // Routine information, such as ongoing status or performance.
- INFO = 200;
-
- // Normal but significant events, such as start up, shut down, or
- // configuration.
- NOTICE = 300;
-
- // Warning events might cause problems.
- WARNING = 400;
-
- // Error events are likely to cause problems.
- ERROR = 500;
-
- // Critical events cause more severe problems or brief outages.
- CRITICAL = 600;
-
- // A person must take an action immediately.
- ALERT = 700;
-
- // One or more systems are unusable.
- EMERGENCY = 800;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/v2/log_entry.proto b/speech/grpc/src/main/java/third_party/google/logging/v2/log_entry.proto
deleted file mode 100644
index 5fb8e8e2783..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/v2/log_entry.proto
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.v2;
-
-import "google/api/annotations.proto";
-import "google/api/monitored_resource.proto";
-import "google/logging/type/http_request.proto";
-import "google/logging/type/log_severity.proto";
-import "google/protobuf/any.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "LogEntryProto";
-option java_package = "com.google.logging.v2";
-
-
-// An individual entry in a log.
-message LogEntry {
- // Required. The resource name of the log to which this log entry
- // belongs. The format of the name is
- // `projects/<project-id>/logs/<log-id%gt;`. Examples:
- // `"projects/my-projectid/logs/syslog"`,
- // `"projects/1234567890/logs/library.googleapis.com%2Fbook_log"`.
- //
- // The log ID part of resource name must be less than 512 characters
- // long and can only include the following characters: upper and
- // lower case alphanumeric characters: [A-Za-z0-9]; and punctuation
- // characters: forward-slash, underscore, hyphen, and period.
- // Forward-slash (`/`) characters in the log ID must be URL-encoded.
- string log_name = 12;
-
- // Required. The monitored resource associated with this log entry.
- // Example: a log entry that reports a database error would be
- // associated with the monitored resource designating the particular
- // database that reported the error.
- google.api.MonitoredResource resource = 8;
-
- // Required. The log entry payload, which can be one of multiple types.
- oneof payload {
- // The log entry payload, represented as a protocol buffer.
- // You can only use `protoPayload` values that belong to a set of approved
- // types.
- google.protobuf.Any proto_payload = 2;
-
- // The log entry payload, represented as a Unicode string (UTF-8).
- string text_payload = 3;
-
- // The log entry payload, represented as a structure that
- // is expressed as a JSON object.
- google.protobuf.Struct json_payload = 6;
- }
-
- // Optional. The time the event described by the log entry occurred. If
- // omitted, Cloud Logging will use the time the log entry is written.
- google.protobuf.Timestamp timestamp = 9;
-
- // Optional. The severity of the log entry. The default value is
- // `LogSeverity.DEFAULT`.
- google.logging.type.LogSeverity severity = 10;
-
- // Optional. A unique ID for the log entry. If you provide this field, the
- // logging service considers other log entries in the same log with the same
- // ID as duplicates which can be removed.
- // If omitted, Cloud Logging will generate a unique ID for this log entry.
- string insert_id = 4;
-
- // Optional. Information about the HTTP request associated with this log entry,
- // if applicable.
- google.logging.type.HttpRequest http_request = 7;
-
- // Optional. A set of user-defined (key, value) data that provides additional
- // information about the log entry.
- map labels = 11;
-
- // Optional. Information about an operation associated with the log entry, if
- // applicable.
- LogEntryOperation operation = 15;
-}
-
-// Additional information about a potentially long-running operation with which
-// a log entry is associated.
-message LogEntryOperation {
- // Required. An arbitrary operation identifier. Log entries with the
- // same identifier are assumed to be part of the same operation.
- //
- string id = 1;
-
- // Required. An arbitrary producer identifier. The combination of
- // `id` and `producer` must be globally unique. Examples for `producer`:
- // `"MyDivision.MyBigCompany.com"`, "github.com/MyProject/MyApplication"`.
- //
- string producer = 2;
-
- // Optional. Set this to True if this is the first log entry in the operation.
- bool first = 3;
-
- // Optional. Set this to True if this is the last log entry in the operation.
- bool last = 4;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/v2/logging.proto b/speech/grpc/src/main/java/third_party/google/logging/v2/logging.proto
deleted file mode 100644
index 44230fcde70..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/v2/logging.proto
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.v2;
-
-import "google/api/annotations.proto";
-import "google/api/monitored_resource.proto";
-import "google/logging/v2/log_entry.proto";
-import "google/protobuf/empty.proto";
-import "google/rpc/status.proto";
-
-option cc_enable_arenas = true;
-option java_multiple_files = true;
-option java_outer_classname = "LoggingProto";
-option java_package = "com.google.logging.v2";
-
-
-// Service for ingesting and querying logs.
-service LoggingServiceV2 {
- // Deletes a log and all its log entries.
- // The log will reappear if it receives new entries.
- //
- rpc DeleteLog(DeleteLogRequest) returns (google.protobuf.Empty) {
- option (google.api.http) = { delete: "/v2beta1/{log_name=projects/*/logs/*}" };
- }
-
- // Writes log entries to Cloud Logging.
- // All log entries in Cloud Logging are written by this method.
- //
- rpc WriteLogEntries(WriteLogEntriesRequest) returns (WriteLogEntriesResponse) {
- option (google.api.http) = { post: "/v2beta1/entries:write" body: "*" };
- }
-
- // Lists log entries. Use this method to retrieve log entries from Cloud
- // Logging. For ways to export log entries, see
- // [Exporting Logs](/logging/docs/export).
- //
- rpc ListLogEntries(ListLogEntriesRequest) returns (ListLogEntriesResponse) {
- option (google.api.http) = { post: "/v2beta1/entries:list" body: "*" };
- }
-
- // Lists monitored resource descriptors that are used by Cloud Logging.
- rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest) returns (ListMonitoredResourceDescriptorsResponse) {
- option (google.api.http) = { get: "/v2beta1/monitoredResourceDescriptors" };
- }
-}
-
-// The parameters to DeleteLog.
-message DeleteLogRequest {
- // Required. The resource name of the log to delete. Example:
- // `"projects/my-project/logs/syslog"`.
- string log_name = 1;
-}
-
-// The parameters to WriteLogEntries.
-message WriteLogEntriesRequest {
- // Optional. A default log resource name for those log entries in `entries`
- // that do not specify their own `logName`. Example:
- // `"projects/my-project/logs/syslog"`. See
- // [LogEntry][google.logging.v2.LogEntry].
- string log_name = 1;
-
- // Optional. A default monitored resource for those log entries in `entries`
- // that do not specify their own `resource`.
- google.api.MonitoredResource resource = 2;
-
- // Optional. User-defined `key:value` items that are added to
- // the `labels` field of each log entry in `entries`, except when a log
- // entry specifies its own `key:value` item with the same key.
- // Example: `{ "size": "large", "color":"red" }`
- map labels = 3;
-
- // Required. The log entries to write. The log entries must have values for
- // all required fields.
- repeated LogEntry entries = 4;
-}
-
-// Result returned from WriteLogEntries.
-message WriteLogEntriesResponse {
-
-}
-
-// The parameters to `ListLogEntries`.
-message ListLogEntriesRequest {
- // Required. One or more project IDs or project numbers from which to retrieve
- // log entries. Examples of a project ID: `"my-project-1A"`, `"1234567890"`.
- repeated string project_ids = 1;
-
- // Optional. An [advanced logs filter](/logging/docs/view/advanced_filters).
- // The filter is compared against all log entries in the projects specified by
- // `projectIds`. Only entries that match the filter are retrieved. An empty
- // filter matches all log entries.
- string filter = 2;
-
- // Optional. How the results should be sorted. Presently, the only permitted
- // values are `"timestamp"` (default) and `"timestamp desc"`. The first
- // option returns entries in order of increasing values of
- // `LogEntry.timestamp` (oldest first), and the second option returns entries
- // in order of decreasing timestamps (newest first). Entries with equal
- // timestamps are returned in order of `LogEntry.insertId`.
- string order_by = 3;
-
- // Optional. The maximum number of results to return from this request. Fewer
- // results might be returned. You must check for the `nextPageToken` result to
- // determine if additional results are available, which you can retrieve by
- // passing the `nextPageToken` value in the `pageToken` parameter to the next
- // request.
- int32 page_size = 4;
-
- // Optional. If the `pageToken` request parameter is supplied, then the next
- // page of results in the set are retrieved. The `pageToken` parameter must
- // be set with the value of the `nextPageToken` result parameter from the
- // previous request. The values of `projectIds`, `filter`, and `orderBy` must
- // be the same as in the previous request.
- string page_token = 5;
-}
-
-// Result returned from `ListLogEntries`.
-message ListLogEntriesResponse {
- // A list of log entries.
- repeated LogEntry entries = 1;
-
- // If there are more results than were returned, then `nextPageToken` is
- // given a value in the response. To get the next batch of results, call
- // this method again using the value of `nextPageToken` as `pageToken`.
- string next_page_token = 2;
-}
-
-// The parameters to ListMonitoredResourceDescriptors
-message ListMonitoredResourceDescriptorsRequest {
- // Optional. The maximum number of results to return from this request. Fewer
- // results might be returned. You must check for the `nextPageToken` result to
- // determine if additional results are available, which you can retrieve by
- // passing the `nextPageToken` value in the `pageToken` parameter to the next
- // request.
- int32 page_size = 1;
-
- // Optional. If the `pageToken` request parameter is supplied, then the next
- // page of results in the set are retrieved. The `pageToken` parameter must
- // be set with the value of the `nextPageToken` result parameter from the
- // previous request.
- string page_token = 2;
-}
-
-// Result returned from ListMonitoredResourceDescriptors.
-message ListMonitoredResourceDescriptorsResponse {
- // A list of resource descriptors.
- repeated google.api.MonitoredResourceDescriptor resource_descriptors = 1;
-
- // If there are more results than were returned, then `nextPageToken` is
- // returned in the response. To get the next batch of results, call this
- // method again using the value of `nextPageToken` as `pageToken`.
- string next_page_token = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/v2/logging_config.proto b/speech/grpc/src/main/java/third_party/google/logging/v2/logging_config.proto
deleted file mode 100644
index 5fdc407af84..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/v2/logging_config.proto
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.v2;
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/timestamp.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "LoggingConfig";
-option java_package = "com.google.logging.v2";
-
-
-service ConfigServiceV2 {
- // Lists sinks.
- rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) {
- option (google.api.http) = { get: "/v2beta1/{project_name=projects/*}/sinks" };
- }
-
- // Gets a sink.
- rpc GetSink(GetSinkRequest) returns (LogSink) {
- option (google.api.http) = { get: "/v2beta1/{sink_name=projects/*/sinks/*}" };
- }
-
- // Creates a sink.
- rpc CreateSink(CreateSinkRequest) returns (LogSink) {
- option (google.api.http) = { post: "/v2beta1/{project_name=projects/*}/sinks" body: "sink" };
- }
-
- // Creates or updates a sink.
- rpc UpdateSink(UpdateSinkRequest) returns (LogSink) {
- option (google.api.http) = { put: "/v2beta1/{sink_name=projects/*/sinks/*}" body: "sink" };
- }
-
- // Deletes a sink.
- rpc DeleteSink(DeleteSinkRequest) returns (google.protobuf.Empty) {
- option (google.api.http) = { delete: "/v2beta1/{sink_name=projects/*/sinks/*}" };
- }
-}
-
-// Describes a sink used to export log entries outside Cloud Logging.
-message LogSink {
- // Available log entry formats. Log entries can be written to Cloud
- // Logging in either format and can be exported in either format.
- // Version 2 is the preferred format.
- enum VersionFormat {
- // An unspecified version format will default to V2.
- VERSION_FORMAT_UNSPECIFIED = 0;
-
- // `LogEntry` version 2 format.
- V2 = 1;
-
- // `LogEntry` version 1 format.
- V1 = 2;
- }
-
- // Required. The client-assigned sink identifier. Example:
- // `"my-severe-errors-to-pubsub"`.
- // Sink identifiers are limited to 1000 characters
- // and can include only the following characters: `A-Z`, `a-z`,
- // `0-9`, and the special characters `_-.`.
- string name = 1;
-
- // The export destination. See
- // [Exporting Logs With Sinks](/logging/docs/api/tasks/exporting-logs).
- // Examples: `"storage.googleapis.com/a-bucket"`,
- // `"bigquery.googleapis.com/projects/a-project-id/datasets/a-dataset"`.
- string destination = 3;
-
- // An [advanced logs filter](/logging/docs/view/advanced_filters)
- // that defines the log entries to be exported. The filter must be
- // consistent with the log entry format designed by the
- // `outputVersionFormat` parameter, regardless of the format of the
- // log entry that was originally written to Cloud Logging.
- // Example: `"logName:syslog AND severity>=ERROR"`.
- string filter = 5;
-
- // The log entry version used when exporting log entries from this
- // sink. This version does not have to correspond to the version of
- // the log entry when it was written to Cloud Logging.
- VersionFormat output_version_format = 6;
-}
-
-// The parameters to `ListSinks`.
-message ListSinksRequest {
- // Required. The resource name of the project containing the sinks.
- // Example: `"projects/my-logging-project"`, `"projects/01234567890"`.
- string project_name = 1;
-
- // Optional. If the `pageToken` request parameter is supplied, then the next
- // page of results in the set are retrieved. The `pageToken` parameter must
- // be set with the value of the `nextPageToken` result parameter from the
- // previous request. The value of `projectName` must be the same as in the
- // previous request.
- string page_token = 2;
-
- // Optional. The maximum number of results to return from this request. Fewer
- // results might be returned. You must check for the `nextPageToken` result to
- // determine if additional results are available, which you can retrieve by
- // passing the `nextPageToken` value in the `pageToken` parameter to the next
- // request.
- int32 page_size = 3;
-}
-
-// Result returned from `ListSinks`.
-message ListSinksResponse {
- // A list of sinks.
- repeated LogSink sinks = 1;
-
- // If there are more results than were returned, then `nextPageToken` is
- // given a value in the response. To get the next batch of results, call this
- // method again using the value of `nextPageToken` as `pageToken`.
- string next_page_token = 2;
-}
-
-// The parameters to `GetSink`.
-message GetSinkRequest {
- // The resource name of the sink to return.
- // Example: `"projects/my-project-id/sinks/my-sink-id"`.
- string sink_name = 1;
-}
-
-// The parameters to `CreateSink`.
-message CreateSinkRequest {
- // The resource name of the project in which to create the sink.
- // Example: `"projects/my-project-id"`.
- //
- // The new sink must be provided in the request.
- string project_name = 1;
-
- // The new sink, which must not have an identifier that already
- // exists.
- LogSink sink = 2;
-}
-
-// The parameters to `UpdateSink`.
-message UpdateSinkRequest {
- // The resource name of the sink to update.
- // Example: `"projects/my-project-id/sinks/my-sink-id"`.
- //
- // The updated sink must be provided in the request and have the
- // same name that is specified in `sinkName`. If the sink does not
- // exist, it is created.
- string sink_name = 1;
-
- // The updated sink, whose name must be the same as the sink
- // identifier in `sinkName`. If `sinkName` does not exist, then
- // this method creates a new sink.
- LogSink sink = 2;
-}
-
-// The parameters to `DeleteSink`.
-message DeleteSinkRequest {
- // The resource name of the sink to delete.
- // Example: `"projects/my-project-id/sinks/my-sink-id"`.
- string sink_name = 1;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/logging/v2/logging_metrics.proto b/speech/grpc/src/main/java/third_party/google/logging/v2/logging_metrics.proto
deleted file mode 100644
index 638cbc377ab..00000000000
--- a/speech/grpc/src/main/java/third_party/google/logging/v2/logging_metrics.proto
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.logging.v2;
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-
-option java_multiple_files = true;
-option java_package = "com.google.logging.v2";
-
-
-service MetricsServiceV2 {
- // Lists logs-based metrics.
- rpc ListLogMetrics(ListLogMetricsRequest) returns (ListLogMetricsResponse) {
- option (google.api.http) = { get: "/v2beta1/{project_name=projects/*}/metrics" };
- }
-
- // Gets a logs-based metric.
- rpc GetLogMetric(GetLogMetricRequest) returns (LogMetric) {
- option (google.api.http) = { get: "/v2beta1/{metric_name=projects/*/metrics/*}" };
- }
-
- // Creates a logs-based metric.
- rpc CreateLogMetric(CreateLogMetricRequest) returns (LogMetric) {
- option (google.api.http) = { post: "/v2beta1/{project_name=projects/*}/metrics" body: "metric" };
- }
-
- // Creates or updates a logs-based metric.
- rpc UpdateLogMetric(UpdateLogMetricRequest) returns (LogMetric) {
- option (google.api.http) = { put: "/v2beta1/{metric_name=projects/*/metrics/*}" body: "metric" };
- }
-
- // Deletes a logs-based metric.
- rpc DeleteLogMetric(DeleteLogMetricRequest) returns (google.protobuf.Empty) {
- option (google.api.http) = { delete: "/v2beta1/{metric_name=projects/*/metrics/*}" };
- }
-}
-
-// Describes a logs-based metric. The value of the metric is the
-// number of log entries that match a logs filter.
-message LogMetric {
- // Required. The client-assigned metric identifier. Example:
- // `"severe_errors"`. Metric identifiers are limited to 1000
- // characters and can include only the following characters: `A-Z`,
- // `a-z`, `0-9`, and the special characters `_-.,+!*',()%/\`. The
- // forward-slash character (`/`) denotes a hierarchy of name pieces,
- // and it cannot be the first character of the name.
- string name = 1;
-
- // A description of this metric, which is used in documentation.
- string description = 2;
-
- // An [advanced logs filter](/logging/docs/view/advanced_filters).
- // Example: `"logName:syslog AND severity>=ERROR"`.
- string filter = 3;
-}
-
-// The parameters to ListLogMetrics.
-message ListLogMetricsRequest {
- // Required. The resource name of the project containing the metrics.
- // Example: `"projects/my-project-id"`.
- string project_name = 1;
-
- // Optional. If the `pageToken` request parameter is supplied, then the next
- // page of results in the set are retrieved. The `pageToken` parameter must
- // be set with the value of the `nextPageToken` result parameter from the
- // previous request. The value of `projectName` must
- // be the same as in the previous request.
- string page_token = 2;
-
- // Optional. The maximum number of results to return from this request. Fewer
- // results might be returned. You must check for the `nextPageToken` result to
- // determine if additional results are available, which you can retrieve by
- // passing the `nextPageToken` value in the `pageToken` parameter to the next
- // request.
- int32 page_size = 3;
-}
-
-// Result returned from ListLogMetrics.
-message ListLogMetricsResponse {
- // A list of logs-based metrics.
- repeated LogMetric metrics = 1;
-
- // If there are more results than were returned, then `nextPageToken` is given
- // a value in the response. To get the next batch of results, call this
- // method again using the value of `nextPageToken` as `pageToken`.
- string next_page_token = 2;
-}
-
-// The parameters to GetLogMetric.
-message GetLogMetricRequest {
- // The resource name of the desired metric.
- // Example: `"projects/my-project-id/metrics/my-metric-id"`.
- string metric_name = 1;
-}
-
-// The parameters to CreateLogMetric.
-message CreateLogMetricRequest {
- // The resource name of the project in which to create the metric.
- // Example: `"projects/my-project-id"`.
- //
- // The new metric must be provided in the request.
- string project_name = 1;
-
- // The new logs-based metric, which must not have an identifier that
- // already exists.
- LogMetric metric = 2;
-}
-
-// The parameters to UpdateLogMetric.
-//
-message UpdateLogMetricRequest {
- // The resource name of the metric to update.
- // Example: `"projects/my-project-id/metrics/my-metric-id"`.
- //
- // The updated metric must be provided in the request and have the
- // same identifier that is specified in `metricName`.
- // If the metric does not exist, it is created.
- string metric_name = 1;
-
- // The updated metric, whose name must be the same as the
- // metric identifier in `metricName`. If `metricName` does not
- // exist, then a new metric is created.
- LogMetric metric = 2;
-}
-
-// The parameters to DeleteLogMetric.
-message DeleteLogMetricRequest {
- // The resource name of the metric to delete.
- // Example: `"projects/my-project-id/metrics/my-metric-id"`.
- string metric_name = 1;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/longrunning/operations.proto b/speech/grpc/src/main/java/third_party/google/longrunning/operations.proto
deleted file mode 100644
index a358d0a3878..00000000000
--- a/speech/grpc/src/main/java/third_party/google/longrunning/operations.proto
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.longrunning;
-
-import "google/api/annotations.proto";
-import "google/protobuf/any.proto";
-import "google/protobuf/empty.proto";
-import "google/rpc/status.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "OperationsProto";
-option java_package = "com.google.longrunning";
-
-
-// Manages long-running operations with an API service.
-//
-// When an API method normally takes long time to complete, it can be designed
-// to return [Operation][google.longrunning.Operation] to the client, and the client can use this
-// interface to receive the real response asynchronously by polling the
-// operation resource, or using `google.watcher.v1.Watcher` interface to watch
-// the response, or pass the operation resource to another API (such as Google
-// Cloud Pub/Sub API) to receive the response. Any API service that returns
-// long-running operations should implement the `Operations` interface so
-// developers can have a consistent client experience.
-service Operations {
- // Gets the latest state of a long-running operation. Clients may use this
- // method to poll the operation result at intervals as recommended by the API
- // service.
- rpc GetOperation(GetOperationRequest) returns (Operation) {
- option (google.api.http) = { get: "/v1/{name=operations/**}" };
- }
-
- // Lists operations that match the specified filter in the request. If the
- // server doesn't support this method, it returns
- // `google.rpc.Code.UNIMPLEMENTED`.
- rpc ListOperations(ListOperationsRequest) returns (ListOperationsResponse) {
- option (google.api.http) = { get: "/v1/{name=operations}" };
- }
-
- // Starts asynchronous cancellation on a long-running operation. The server
- // makes a best effort to cancel the operation, but success is not
- // guaranteed. If the server doesn't support this method, it returns
- // `google.rpc.Code.UNIMPLEMENTED`. Clients may use
- // [Operations.GetOperation] or other methods to check whether the
- // cancellation succeeded or the operation completed despite cancellation.
- rpc CancelOperation(CancelOperationRequest) returns (google.protobuf.Empty) {
- option (google.api.http) = { post: "/v1/{name=operations/**}:cancel" body: "*" };
- }
-
- // Deletes a long-running operation. It indicates the client is no longer
- // interested in the operation result. It does not cancel the operation.
- rpc DeleteOperation(DeleteOperationRequest) returns (google.protobuf.Empty) {
- option (google.api.http) = { delete: "/v1/{name=operations/**}" };
- }
-}
-
-// This resource represents a long-running operation that is the result of a
-// network API call.
-message Operation {
- // The name of the operation resource, which is only unique within the same
- // service that originally returns it.
- string name = 1;
-
- // Some service-specific metadata associated with the operation. It typically
- // contains progress information and common metadata such as create time.
- // Some services may not provide such metadata. Any method that returns a
- // long-running operation should document the metadata type, if any.
- google.protobuf.Any metadata = 2;
-
- // If the value is false, it means the operation is still in progress.
- // If true, the operation is completed and the `result` is available.
- bool done = 3;
-
- oneof result {
- // The error result of the operation in case of failure.
- google.rpc.Status error = 4;
-
- // The normal response of the operation in case of success. If the original
- // method returns no data on success, such as `Delete`, the response will be
- // `google.protobuf.Empty`. If the original method is standard
- // `Get`/`Create`/`Update`, the response should be the resource. For other
- // methods, the response should have the type `XxxResponse`, where `Xxx`
- // is the original method name. For example, if the original method name
- // is `TakeSnapshot()`, the inferred response type will be
- // `TakeSnapshotResponse`.
- google.protobuf.Any response = 5;
- }
-}
-
-// The request message for [Operations.GetOperation][google.longrunning.Operations.GetOperation].
-message GetOperationRequest {
- // The name of the operation resource.
- string name = 1;
-}
-
-// The request message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
-message ListOperationsRequest {
- // The name of the operation collection.
- string name = 4;
-
- // The standard List filter.
- string filter = 1;
-
- // The standard List page size.
- int32 page_size = 2;
-
- // The standard List page token.
- string page_token = 3;
-}
-
-// The response message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
-message ListOperationsResponse {
- // A list of operations that match the specified filter in the request.
- repeated Operation operations = 1;
-
- // The standard List next-page token.
- string next_page_token = 2;
-}
-
-// The request message for [Operations.CancelOperation][google.longrunning.Operations.CancelOperation].
-message CancelOperationRequest {
- // The name of the operation resource to be cancelled.
- string name = 1;
-}
-
-// The request message for [Operations.DeleteOperation][google.longrunning.Operations.DeleteOperation].
-message DeleteOperationRequest {
- // The name of the operation resource to be deleted.
- string name = 1;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/rpc/README.md b/speech/grpc/src/main/java/third_party/google/rpc/README.md
deleted file mode 100644
index aa8877db842..00000000000
--- a/speech/grpc/src/main/java/third_party/google/rpc/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Google RPC
-
-This package contains type definitions for general RPC systems. While
-[gRPC](https://github.com/grpc) is using these defintions, but they
-are not designed specifically to support gRPC.
diff --git a/speech/grpc/src/main/java/third_party/google/rpc/code.proto b/speech/grpc/src/main/java/third_party/google/rpc/code.proto
deleted file mode 100644
index f9ceddcbc10..00000000000
--- a/speech/grpc/src/main/java/third_party/google/rpc/code.proto
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.rpc;
-
-option java_multiple_files = true;
-option java_outer_classname = "CodeProto";
-option java_package = "com.google.rpc";
-
-
-// The canonical error codes for Google APIs.
-// Warnings:
-//
-// - Do not change any numeric assignments.
-// - Changes to this list should be made only if there is a compelling
-// need that can't be satisfied in another way.
-//
-// Sometimes multiple error codes may apply. Services should return
-// the most specific error code that applies. For example, prefer
-// `OUT_OF_RANGE` over `FAILED_PRECONDITION` if both codes apply.
-// Similarly prefer `NOT_FOUND` or `ALREADY_EXISTS` over `FAILED_PRECONDITION`.
-enum Code {
- // Not an error; returned on success
- //
- // HTTP Mapping: 200 OK
- OK = 0;
-
- // The operation was cancelled, typically by the caller.
- //
- // HTTP Mapping: 499 Client Closed Request
- CANCELLED = 1;
-
- // Unknown error. For example, this error may be returned when
- // a `Status` value received from another address space belongs to
- // an error space that is not known in this address space. Also
- // errors raised by APIs that do not return enough error information
- // may be converted to this error.
- //
- // HTTP Mapping: 500 Internal Server Error
- UNKNOWN = 2;
-
- // The client specified an invalid argument. Note that this differs
- // from `FAILED_PRECONDITION`. `INVALID_ARGUMENT` indicates arguments
- // that are problematic regardless of the state of the system
- // (e.g., a malformed file name).
- //
- // HTTP Mapping: 400 Bad Request
- INVALID_ARGUMENT = 3;
-
- // The deadline expired before the operation could complete. For operations
- // that change the state of the system, this error may be returned
- // even if the operation has completed successfully. For example, a
- // successful response from a server could have been delayed long
- // enough for the deadline to expire.
- //
- // HTTP Mapping: 504 Gateway Timeout
- DEADLINE_EXCEEDED = 4;
-
- // Some requested entity (e.g., file or directory) was not found.
- // For privacy reasons, this code *might* be returned when the client
- // does not have the access rights to the entity.
- //
- // HTTP Mapping: 404 Not Found
- NOT_FOUND = 5;
-
- // The entity that a client attempted to create (e.g., file or directory)
- // already exists.
- //
- // HTTP Mapping: 409 Conflict
- ALREADY_EXISTS = 6;
-
- // The caller does not have permission to execute the specified
- // operation. `PERMISSION_DENIED` must not be used for rejections
- // caused by exhausting some resource (use `RESOURCE_EXHAUSTED`
- // instead for those errors). `PERMISSION_DENIED` must not be
- // used if the caller can not be identified (use `UNAUTHENTICATED`
- // instead for those errors).
- //
- // HTTP Mapping: 403 Forbidden
- PERMISSION_DENIED = 7;
-
- // The request does not have valid authentication credentials for the
- // operation.
- //
- // HTTP Mapping: 401 Unauthorized
- UNAUTHENTICATED = 16;
-
- // Some resource has been exhausted, perhaps a per-user quota, or
- // perhaps the entire file system is out of space.
- //
- // HTTP Mapping: 429 Too Many Requests
- RESOURCE_EXHAUSTED = 8;
-
- // The operation was rejected because the system is not in a state
- // required for the operation's execution. For example, the directory
- // to be deleted is non-empty, an rmdir operation is applied to
- // a non-directory, etc.
- //
- // Service implementors can use the following guidelines to decide
- // between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
- // (a) Use `UNAVAILABLE` if the client can retry just the failing call.
- // (b) Use `ABORTED` if the client should retry at a higher level
- // (e.g., restarting a read-modify-write sequence).
- // (c) Use `FAILED_PRECONDITION` if the client should not retry until
- // the system state has been explicitly fixed. E.g., if an "rmdir"
- // fails because the directory is non-empty, `FAILED_PRECONDITION`
- // should be returned since the client should not retry unless
- // the files are deleted from the directory.
- // (d) Use `FAILED_PRECONDITION` if the client performs conditional
- // REST Get/Update/Delete on a resource and the resource on the
- // server does not match the condition. E.g., conflicting
- // read-modify-write on the same resource.
- //
- // HTTP Mapping: 400 Bad Request
- //
- // NOTE: HTTP spec says `412 Precondition Failed` should be used only if
- // the request contains Etag-related headers. So if the server does see
- // Etag-related headers in the request, it may choose to return 412
- // instead of 400 for this error code.
- FAILED_PRECONDITION = 9;
-
- // The operation was aborted, typically due to a concurrency issue such as
- // a sequencer check failure or transaction abort.
- //
- // See the guidelines above for deciding between `FAILED_PRECONDITION`,
- // `ABORTED`, and `UNAVAILABLE`.
- //
- // HTTP Mapping: 409 Conflict
- ABORTED = 10;
-
- // The operation was attempted past the valid range. E.g., seeking or
- // reading past end-of-file.
- //
- // Unlike `INVALID_ARGUMENT`, this error indicates a problem that may
- // be fixed if the system state changes. For example, a 32-bit file
- // system will generate `INVALID_ARGUMENT` if asked to read at an
- // offset that is not in the range [0,2^32-1], but it will generate
- // `OUT_OF_RANGE` if asked to read from an offset past the current
- // file size.
- //
- // There is a fair bit of overlap between `FAILED_PRECONDITION` and
- // `OUT_OF_RANGE`. We recommend using `OUT_OF_RANGE` (the more specific
- // error) when it applies so that callers who are iterating through
- // a space can easily look for an `OUT_OF_RANGE` error to detect when
- // they are done.
- //
- // HTTP Mapping: 400 Bad Request
- OUT_OF_RANGE = 11;
-
- // The operation is not implemented or is not supported/enabled in this
- // service.
- //
- // HTTP Mapping: 501 Not Implemented
- UNIMPLEMENTED = 12;
-
- // Internal errors. This means that some invariants expected by the
- // underlying system have been broken. This error code is reserved
- // for serious errors.
- //
- // HTTP Mapping: 500 Internal Server Error
- INTERNAL = 13;
-
- // The service is currently unavailable. This is most likely a
- // transient condition, which can be corrected by retrying with
- // a backoff.
- //
- // See the guidelines above for deciding between `FAILED_PRECONDITION`,
- // `ABORTED`, and `UNAVAILABLE`.
- //
- // HTTP Mapping: 503 Service Unavailable
- UNAVAILABLE = 14;
-
- // Unrecoverable data loss or corruption.
- //
- // HTTP Mapping: 500 Internal Server Error
- DATA_LOSS = 15;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/rpc/error_details.proto b/speech/grpc/src/main/java/third_party/google/rpc/error_details.proto
deleted file mode 100644
index 82472b8b2e6..00000000000
--- a/speech/grpc/src/main/java/third_party/google/rpc/error_details.proto
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.rpc;
-
-import "google/protobuf/duration.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "ErrorDetailsProto";
-option java_package = "com.google.rpc";
-
-
-// Describes when the clients can retry a failed request. Clients could ignore
-// the recommendation here or retry when this information is missing from error
-// responses.
-//
-// It's always recommended that clients should use exponential backoff when
-// retrying.
-//
-// Clients should wait until `retry_delay` amount of time has passed since
-// receiving the error response before retrying. If retrying requests also
-// fail, clients should use an exponential backoff scheme to gradually increase
-// the delay between retries based on `retry_delay`, until either a maximum
-// number of retires have been reached or a maximum retry delay cap has been
-// reached.
-message RetryInfo {
- // Clients should wait at least this long between retrying the same request.
- google.protobuf.Duration retry_delay = 1;
-}
-
-// Describes additional debugging info.
-message DebugInfo {
- // The stack trace entries indicating where the error occurred.
- repeated string stack_entries = 1;
-
- // Additional debugging information provided by the server.
- string detail = 2;
-}
-
-// Describes how a quota check failed.
-//
-// For example if a daily limit was exceeded for the calling project,
-// a service could respond with a QuotaFailure detail containing the project
-// id and the description of the quota limit that was exceeded. If the
-// calling project hasn't enabled the service in the developer console, then
-// a service could respond with the project id and set `service_disabled`
-// to true.
-//
-// Also see RetryDetail and Help types for other details about handling a
-// quota failure.
-message QuotaFailure {
- // A message type used to describe a single quota violation. For example, a
- // daily quota or a custom quota that was exceeded.
- message Violation {
- // The subject on which the quota check failed.
- // For example, "clientip:" or "project:".
- string subject = 1;
-
- // A description of how the quota check failed. Clients can use this
- // description to find more about the quota configuration in the service's
- // public documentation, or find the relevant quota limit to adjust through
- // developer console.
- //
- // For example: "Service disabled" or "Daily Limit for read operations
- // exceeded".
- string description = 2;
- }
-
- // Describes all quota violations.
- repeated Violation violations = 1;
-}
-
-// Describes violations in a client request. This error type focuses on the
-// syntactic aspects of the request.
-message BadRequest {
- // A message type used to describe a single bad request field.
- message FieldViolation {
- // A path leading to a field in the request body. The value will be a
- // sequence of dot-separated identifiers that identify a protocol buffer
- // field. E.g., "violations.field" would identify this field.
- string field = 1;
-
- // A description of why the request element is bad.
- string description = 2;
- }
-
- // Describes all violations in a client request.
- repeated FieldViolation field_violations = 1;
-}
-
-// Contains metadata about the request that clients can attach when filing a bug
-// or providing other forms of feedback.
-message RequestInfo {
- // An opaque string that should only be interpreted by the service generating
- // it. For example, it can be used to identify requests in the service's logs.
- string request_id = 1;
-
- // Any data that was used to serve this request. For example, an encrypted
- // stack trace that can be sent back to the service provider for debugging.
- string serving_data = 2;
-}
-
-// Describes the resource that is being accessed.
-message ResourceInfo {
- // A name for the type of resource being accessed, e.g. "sql table",
- // "cloud storage bucket", "file", "Google calendar"; or the type URL
- // of the resource: e.g. "type.googleapis.com/google.pubsub.v1.Topic".
- string resource_type = 1;
-
- // The name of the resource being accessed. For example, a shared calendar
- // name: "example.com_4fghdhgsrgh@group.calendar.google.com", if the current
- // error is [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].
- string resource_name = 2;
-
- // The owner of the resource (optional).
- // For example, "user:" or "project:".
- string owner = 3;
-
- // Describes what error is encountered when accessing this resource.
- // For example, updating a cloud project may require the `writer` permission
- // on the developer console project.
- string description = 4;
-}
-
-// Provides links to documentation or for performing an out of band action.
-//
-// For example, if a quota check failed with an error indicating the calling
-// project hasn't enabled the accessed service, this can contain a URL pointing
-// directly to the right place in the developer console to flip the bit.
-message Help {
- // Describes a URL link.
- message Link {
- // Describes what the link offers.
- string description = 1;
-
- // The URL of the link.
- string url = 2;
- }
-
- // URL(s) pointing to additional information on handling the current error.
- repeated Link links = 1;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/rpc/status.proto b/speech/grpc/src/main/java/third_party/google/rpc/status.proto
deleted file mode 100644
index 8fca6ab22d9..00000000000
--- a/speech/grpc/src/main/java/third_party/google/rpc/status.proto
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.rpc;
-
-import "google/protobuf/any.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "StatusProto";
-option java_package = "com.google.rpc";
-
-
-// The `Status` type defines a logical error model that is suitable for different
-// programming environments, including REST APIs and RPC APIs. It is used by
-// [gRPC](https://github.com/grpc). The error model is designed to be:
-//
-// - Simple to use and understand for most users
-// - Flexible enough to meet unexpected needs
-//
-// # Overview
-//
-// The `Status` message contains three pieces of data: error code, error message,
-// and error details. The error code should be an enum value of
-// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes if needed. The
-// error message should be a developer-facing English message that helps
-// developers *understand* and *resolve* the error. If a localized user-facing
-// error message is needed, put the localized message in the error details or
-// localize it in the client. The optional error details may contain arbitrary
-// information about the error. There is a predefined set of error detail types
-// in the package `google.rpc` which can be used for common error conditions.
-//
-// # Language mapping
-//
-// The `Status` message is the logical representation of the error model, but it
-// is not necessarily the actual wire format. When the `Status` message is
-// exposed in different client libraries and different wire protocols, it can be
-// mapped differently. For example, it will likely be mapped to some exceptions
-// in Java, but more likely mapped to some error codes in C.
-//
-// # Other uses
-//
-// The error model and the `Status` message can be used in a variety of
-// environments, either with or without APIs, to provide a
-// consistent developer experience across different environments.
-//
-// Example uses of this error model include:
-//
-// - Partial errors. If a service needs to return partial errors to the client,
-// it may embed the `Status` in the normal response to indicate the partial
-// errors.
-//
-// - Workflow errors. A typical workflow has multiple steps. Each step may
-// have a `Status` message for error reporting purpose.
-//
-// - Batch operations. If a client uses batch request and batch response, the
-// `Status` message should be used directly inside batch response, one for
-// each error sub-response.
-//
-// - Asynchronous operations. If an API call embeds asynchronous operation
-// results in its response, the status of those operations should be
-// represented directly using the `Status` message.
-//
-// - Logging. If some API errors are stored in logs, the message `Status` could
-// be used directly after any stripping needed for security/privacy reasons.
-message Status {
- // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
- int32 code = 1;
-
- // A developer-facing error message, which should be in English. Any
- // user-facing error message should be localized and sent in the
- // [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
- string message = 2;
-
- // A list of messages that carry the error details. There will be a
- // common set of message types for APIs to use.
- repeated google.protobuf.Any details = 3;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/speech/v1/cloud-speech.proto b/speech/grpc/src/main/java/third_party/google/speech/v1/cloud-speech.proto
deleted file mode 100644
index 97dd8629649..00000000000
--- a/speech/grpc/src/main/java/third_party/google/speech/v1/cloud-speech.proto
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.cloud.speech.v1;
-
-import "google/api/annotations.proto";
-import "google/rpc/status.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "SpeechProto";
-option java_package = "com.google.cloud.speech.v1";
-
-
-// Service that implements Google Cloud Speech API.
-service Speech {
- // Perform bidirectional streaming speech recognition on audio using gRPC.
- rpc Recognize(stream RecognizeRequest) returns (stream RecognizeResponse);
-
- // Perform non-streaming speech recognition on audio using HTTPS.
- rpc NonStreamingRecognize(RecognizeRequest) returns (NonStreamingRecognizeResponse) {
- option (google.api.http) = { post: "/v1/speech:recognize" body: "*" };
- }
-}
-
-// `RecognizeRequest` is the only message type sent by the client.
-//
-// `NonStreamingRecognize` sends only one `RecognizeRequest` message and it
-// must contain both an `initial_request` and an 'audio_request`.
-//
-// Streaming `Recognize` sends one or more `RecognizeRequest` messages. The
-// first message must contain an `initial_request` and may contain an
-// 'audio_request`. Any subsequent messages must not contain an
-// `initial_request` and must contain an 'audio_request`.
-message RecognizeRequest {
- // The `initial_request` message provides information to the recognizer
- // that specifies how to process the request.
- //
- // The first `RecognizeRequest` message must contain an `initial_request`.
- // Any subsequent `RecognizeRequest` messages must not contain an
- // `initial_request`.
- InitialRecognizeRequest initial_request = 1;
-
- // The audio data to be recognized. For `NonStreamingRecognize`, all the
- // audio data must be contained in the first (and only) `RecognizeRequest`
- // message. For streaming `Recognize`, sequential chunks of audio data are
- // sent in sequential `RecognizeRequest` messages.
- AudioRequest audio_request = 2;
-}
-
-// The `InitialRecognizeRequest` message provides information to the recognizer
-// that specifies how to process the request.
-message InitialRecognizeRequest {
- // Audio encoding of the data sent in the audio message.
- enum AudioEncoding {
- // Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
- ENCODING_UNSPECIFIED = 0;
-
- // Uncompressed 16-bit signed little-endian samples.
- // This is the simplest encoding format, useful for getting started.
- // However, because it is uncompressed, it is not recommended for deployed
- // clients.
- LINEAR16 = 1;
-
- // This is the recommended encoding format because it uses lossless
- // compression; therefore recognition accuracy is not compromised by a lossy
- // codec.
- //
- // The stream FLAC format is specified at:
- // http://flac.sourceforge.net/documentation.html.
- // Only 16-bit samples are supported.
- // Not all fields in STREAMINFO are supported.
- FLAC = 2;
-
- // 8-bit samples that compand 14-bit audio samples using PCMU/mu-law.
- MULAW = 3;
-
- // Adaptive Multi-Rate Narrowband codec. `sample_rate` must be 8000 Hz.
- AMR = 4;
-
- // Adaptive Multi-Rate Wideband codec. `sample_rate` must be 16000 Hz.
- AMR_WB = 5;
- }
-
- // [Required] Encoding of audio data sent in all `AudioRequest` messages.
- AudioEncoding encoding = 1;
-
- // [Required] Sample rate in Hertz of the audio data sent in all
- // AudioRequest messages.
- // 16000 is optimal. Valid values are: 8000-48000.
- int32 sample_rate = 2;
-
- // [Optional] The language of the supplied audio as a BCP-47 language tag.
- // Example: "en-GB" https://www.rfc-editor.org/rfc/bcp/bcp47.txt
- // If omitted, defaults to "en-US".
- string language_code = 3;
-
- // [Optional] Maximum number of recognition hypotheses to be returned.
- // Specifically, the maximum number of `SpeechRecognitionAlternative` messages
- // within each `SpeechRecognitionResult`.
- // The server may return fewer than `max_alternatives`.
- // Valid values are `0`-`30`. A value of `0` or `1` will return a maximum of
- // `1`. If omitted, defaults to `1`.
- int32 max_alternatives = 4;
-
- // [Optional] If set to `true`, the server will attempt to filter out
- // profanities, replacing all but the initial character in each filtered word
- // with asterisks, e.g. "f***". If set to `false` or omitted, profanities
- // won't be filtered out.
- bool profanity_filter = 5;
-
- // [Optional] If `false` or omitted, the recognizer will detect a single
- // spoken utterance, and it will cease recognition when the user stops
- // speaking. If `enable_endpointer_events` is `true`, it will return
- // `END_OF_UTTERANCE` when it detects that the user has stopped speaking.
- // In all cases, it will return no more than one `SpeechRecognitionResult`,
- // and set the `is_final` flag to `true`.
- //
- // If `true`, the recognizer will continue recognition (even if the user
- // pauses speaking) until the client sends an `end_of_data` message or when
- // the maximum time limit has been reached. Multiple
- // `SpeechRecognitionResult`s with the `is_final` flag set to `true` may be
- // returned to indicate that the recognizer will not return any further
- // hypotheses for this portion of the transcript.
- bool continuous = 6;
-
- // [Optional] If this parameter is `true`, interim results may be returned as
- // they become available.
- // If `false` or omitted, only `is_final=true` result(s) are returned.
- bool interim_results = 7;
-
- // [Optional] If this parameter is `true`, `EndpointerEvents` may be returned
- // as they become available.
- // If `false` or omitted, no `EndpointerEvents` are returned.
- bool enable_endpointer_events = 8;
-
- // [Optional] URI that points to a file where the recognition result should
- // be stored in JSON format. If omitted or empty string, the recognition
- // result is returned in the response. Should be specified only for
- // `NonStreamingRecognize`. If specified in a `Recognize` request,
- // `Recognize` returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
- // If specified in a `NonStreamingRecognize` request,
- // `NonStreamingRecognize` returns immediately, and the output file
- // is created asynchronously once the audio processing completes.
- // Currently, only Google Cloud Storage URIs are supported, which must be
- // specified in the following format: `gs://bucket_name/object_name`
- // (other URI formats return [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For
- // more information, see [Request URIs](/storage/docs/reference-uris).
- string output_uri = 9;
-}
-
-// Contains audio data in the format specified in the `InitialRecognizeRequest`.
-// Either `content` or `uri` must be supplied. Supplying both or neither
-// returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
-message AudioRequest {
- // The audio data bytes encoded as specified in
- // `InitialRecognizeRequest`. Note: as with all bytes fields, protobuffers
- // use a pure binary representation, whereas JSON representations use base64.
- bytes content = 1;
-
- // URI that points to a file that contains audio data bytes as specified in
- // `InitialRecognizeRequest`. Currently, only Google Cloud Storage URIs are
- // supported, which must be specified in the following format:
- // `gs://bucket_name/object_name` (other URI formats return
- // [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
- // [Request URIs](/storage/docs/reference-uris).
- string uri = 2;
-}
-
-// `NonStreamingRecognizeResponse` is the only message returned to the client by
-// `NonStreamingRecognize`. It contains the result as zero or more sequential
-// `RecognizeResponse` messages.
-//
-// Note that streaming `Recognize` will also return multiple `RecognizeResponse`
-// messages, but each message is individually streamed.
-message NonStreamingRecognizeResponse {
- // [Output-only] Sequential list of messages returned by the recognizer.
- repeated RecognizeResponse responses = 1;
-}
-
-// `RecognizeResponse` is the only message type returned to the client.
-message RecognizeResponse {
- // Indicates the type of endpointer event.
- enum EndpointerEvent {
- // No endpointer event specified.
- ENDPOINTER_EVENT_UNSPECIFIED = 0;
-
- // Speech has been detected in the audio stream.
- START_OF_SPEECH = 1;
-
- // Speech has ceased to be detected in the audio stream.
- END_OF_SPEECH = 2;
-
- // The end of the audio stream has been reached. and it is being processed.
- END_OF_AUDIO = 3;
-
- // This event is only sent when continuous is `false`. It indicates that the
- // server has detected the end of the user's speech utterance and expects no
- // additional speech. Therefore, the server will not process additional
- // audio. The client should stop sending additional audio data.
- END_OF_UTTERANCE = 4;
- }
-
- // [Output-only] If set, returns a [google.rpc.Status][] message that
- // specifies the error for the operation.
- google.rpc.Status error = 1;
-
- // [Output-only] For `continuous=false`, this repeated list contains zero or
- // one result that corresponds to all of the audio processed so far. For
- // `continuous=true`, this repeated list contains zero or more results that
- // correspond to consecutive portions of the audio being processed.
- // In both cases, contains zero or one `is_final=true` result (the newly
- // settled portion), followed by zero or more `is_final=false` results.
- repeated SpeechRecognitionResult results = 2;
-
- // [Output-only] Indicates the lowest index in the `results` array that has
- // changed. The repeated `SpeechRecognitionResult` results overwrite past
- // results at this index and higher.
- int32 result_index = 3;
-
- // [Output-only] Indicates the type of endpointer event.
- EndpointerEvent endpoint = 4;
-}
-
-// A speech recognition result corresponding to a portion of the audio.
-message SpeechRecognitionResult {
- // [Output-only] May contain one or more recognition hypotheses (up to the
- // maximum specified in `max_alternatives`).
- repeated SpeechRecognitionAlternative alternatives = 1;
-
- // [Output-only] Set `true` if this is the final time the speech service will
- // return this particular `SpeechRecognitionResult`. If `false`, this
- // represents an interim result that may change.
- bool is_final = 2;
-
- // [Output-only] An estimate of the probability that the recognizer will not
- // change its guess about this interim result. Values range from 0.0
- // (completely unstable) to 1.0 (completely stable). Note that this is not the
- // same as `confidence`, which estimates the probability that a recognition
- // result is correct.
- // This field is only provided for interim results (`is_final=false`).
- // The default of 0.0 is a sentinel value indicating stability was not set.
- float stability = 3;
-}
-
-// Alternative hypotheses (a.k.a. n-best list).
-message SpeechRecognitionAlternative {
- // [Output-only] Transcript text representing the words that the user spoke.
- string transcript = 1;
-
- // [Output-only] The confidence estimate between 0.0 and 1.0. A higher number
- // means the system is more confident that the recognition is correct.
- // This field is typically provided only for the top hypothesis. and only for
- // `is_final=true` results.
- // The default of 0.0 is a sentinel value indicating confidence was not set.
- float confidence = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/speech/v1beta1/cloud_speech.proto b/speech/grpc/src/main/java/third_party/google/speech/v1beta1/cloud_speech.proto
deleted file mode 100644
index 735be84fad4..00000000000
--- a/speech/grpc/src/main/java/third_party/google/speech/v1beta1/cloud_speech.proto
+++ /dev/null
@@ -1,335 +0,0 @@
-// 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.
-
-syntax = "proto3";
-
-package google.cloud.speech.v1beta1;
-
-option java_multiple_files = true;
-option java_outer_classname = "SpeechProto";
-option java_package = "com.google.cloud.speech.v1beta1";
-
-import "google/api/annotations.proto";
-import "google/longrunning/operations.proto";
-import "google/rpc/status.proto";
-
-
-// Service that implements Google Cloud Speech API.
-service Speech {
- // Perform synchronous speech-recognition: receive results after all audio
- // has been sent and processed.
- rpc SyncRecognize(SyncRecognizeRequest) returns (SyncRecognizeResponse) {
- option (google.api.http) =
- { post: "/v1beta1/speech:syncrecognize" body: "*" };
- }
-
- // Perform asynchronous speech-recognition: receive results via the
- // google.longrunning.Operations interface. `Operation.response` returns
- // `AsyncRecognizeResponse`.
- rpc AsyncRecognize(AsyncRecognizeRequest)
- returns (google.longrunning.Operation) {
- option (google.api.http) =
- { post: "/v1beta1/speech:asyncrecognize" body: "*" };
- }
-
- // Perform bidirectional streaming speech-recognition: receive results while
- // sending audio. This method is only available via the gRPC API (not REST).
- rpc StreamingRecognize(stream StreamingRecognizeRequest)
- returns (stream StreamingRecognizeResponse);
-}
-
-// `SyncRecognizeRequest` is the top-level message sent by the client for
-// the `SyncRecognize` method.
-message SyncRecognizeRequest {
- // [Required] The `config` message provides information to the recognizer
- // that specifies how to process the request.
- RecognitionConfig config = 1;
-
- // [Required] The audio data to be recognized.
- RecognitionAudio audio = 2;
-}
-
-// `AsyncRecognizeRequest` is the top-level message sent by the client for
-// the `AsyncRecognize` method.
-message AsyncRecognizeRequest {
- // [Required] The `config` message provides information to the recognizer
- // that specifies how to process the request.
- RecognitionConfig config = 1;
-
- // [Required] The audio data to be recognized.
- RecognitionAudio audio = 2;
-}
-
-// `StreamingRecognizeRequest` is the top-level message sent by the client for
-// the `StreamingRecognize`. Multiple `StreamingRecognizeRequest` messages are
-// sent. The first message must contain a `streaming_config` message and must
-// not contain `audio` data. All subsequent messages must contain `audio` data
-// and must not contain a `streaming_config` message.
-message StreamingRecognizeRequest {
- oneof streaming_request {
- // The `streaming_config` message provides information to the recognizer
- // that specifies how to process the request.
- //
- // The first `StreamingRecognizeRequest` message must contain a
- // `streaming_config` message.
- StreamingRecognitionConfig streaming_config = 1;
-
- // The audio data to be recognized. Sequential chunks of audio data are sent
- // in sequential `StreamingRecognizeRequest` messages. The first
- // `StreamingRecognizeRequest` message must not contain `audio_content` data
- // and all subsequent `StreamingRecognizeRequest` messages must contain
- // `audio_content` data. The audio bytes must be encoded as specified in
- // `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
- // pure binary representation (not base64).
- bytes audio_content = 2 [ctype = CORD];
- }
-}
-
-// The `StreamingRecognitionConfig` message provides information to the
-// recognizer that specifies how to process the request.
-message StreamingRecognitionConfig {
- // [Required] The `config` message provides information to the recognizer
- // that specifies how to process the request.
- RecognitionConfig config = 1;
-
- // [Optional] If `false` or omitted, the recognizer will perform continuous
- // recognition (continuing to process audio even if the user pauses speaking)
- // until the client closes the output stream (gRPC API) or when the maximum
- // time limit has been reached. Multiple `SpeechRecognitionResult`s with the
- // `is_final` flag set to `true` may be returned.
- //
- // If `true`, the recognizer will detect a single spoken utterance. When it
- // detects that the user has paused or stopped speaking, it will return an
- // `END_OF_UTTERANCE` event and cease recognition. It will return no more than
- // one `SpeechRecognitionResult` with the `is_final` flag set to `true`.
- bool single_utterance = 2;
-
- // [Optional] If `true`, interim results (tentative hypotheses) may be
- // returned as they become available (these interim results are indicated with
- // the `is_final=false` flag).
- // If `false` or omitted, only `is_final=true` result(s) are returned.
- bool interim_results = 3;
-}
-
-// The `RecognitionConfig` message provides information to the recognizer
-// that specifies how to process the request.
-message RecognitionConfig {
- // Audio encoding of the data sent in the audio message. All encodings support
- // only 1 channel (mono) audio. Only `FLAC` includes a header that describes
- // the bytes of audio that follow the header. The other encodings are raw
- // audio bytes with no header.
- //
- // For best results, the audio source should be captured and transmitted using
- // a lossless encoding (`FLAC` or `LINEAR16`). Recognition accuracy may be
- // reduced if lossy codecs (such as AMR, AMR_WB and MULAW) are used to capture
- // or transmit the audio, particularly if background noise is present.
- enum AudioEncoding {
- // Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
- ENCODING_UNSPECIFIED = 0;
-
- // Uncompressed 16-bit signed little-endian samples.
- // This is the only encoding that may be used by `AsyncRecognize`.
- LINEAR16 = 1;
-
- // This is the recommended encoding for `SyncRecognize` and
- // `StreamingRecognize` because it uses lossless compression; therefore
- // recognition accuracy is not compromised by a lossy codec.
- //
- // The stream FLAC (Free Lossless Audio Codec) encoding is specified at:
- // http://flac.sourceforge.net/documentation.html.
- // Only 16-bit samples are supported.
- // Not all fields in STREAMINFO are supported.
- FLAC = 2;
-
- // 8-bit samples that compand 14-bit audio samples using G.711 PCMU/mu-law.
- MULAW = 3;
-
- // Adaptive Multi-Rate Narrowband codec. `sample_rate` must be 8000 Hz.
- AMR = 4;
-
- // Adaptive Multi-Rate Wideband codec. `sample_rate` must be 16000 Hz.
- AMR_WB = 5;
- }
-
- // [Required] Encoding of audio data sent in all `RecognitionAudio` messages.
- AudioEncoding encoding = 1;
-
- // [Required] Sample rate in Hertz of the audio data sent in all
- // `RecognitionAudio` messages. Valid values are: 8000-48000.
- // 16000 is optimal. For best results, set the sampling rate of the audio
- // source to 16000 Hz. If that's not possible, use the native sample rate of
- // the audio source (instead of re-sampling).
- int32 sample_rate = 2;
-
- // [Optional] The language of the supplied audio as a BCP-47 language tag.
- // Example: "en-GB" https://www.rfc-editor.org/rfc/bcp/bcp47.txt
- // If omitted, defaults to "en-US". See
- // [Language Support](/speech/docs/best-practices#language_support) for
- // a list of the currently supported language codes.
- string language_code = 3;
-
- // [Optional] Maximum number of recognition hypotheses to be returned.
- // Specifically, the maximum number of `SpeechRecognitionAlternative` messages
- // within each `SpeechRecognitionResult`.
- // The server may return fewer than `max_alternatives`.
- // Valid values are `0`-`30`. A value of `0` or `1` will return a maximum of
- // `1`. If omitted, defaults to `1`.
- int32 max_alternatives = 4;
-
- // [Optional] If set to `true`, the server will attempt to filter out
- // profanities, replacing all but the initial character in each filtered word
- // with asterisks, e.g. "f***". If set to `false` or omitted, profanities
- // won't be filtered out.
- bool profanity_filter = 5;
-
- // [Optional] A means to provide context to assist the speech recognition.
- SpeechContext speech_context = 6;
-}
-
-// Provides "hints" to the speech recognizer to favor specific words and phrases
-// in the results.
-message SpeechContext {
- // [Optional] A list of up to 50 phrases of up to 100 characters each to
- // provide words and phrases "hints" to the speech recognition so that it is
- // more likely to recognize them.
- repeated string phrases = 1;
-}
-
-// Contains audio data in the encoding specified in the `RecognitionConfig`.
-// Either `content` or `uri` must be supplied. Supplying both or neither
-// returns [google.rpc.Code.INVALID_ARGUMENT][].
-message RecognitionAudio {
- oneof audio_source {
- // The audio data bytes encoded as specified in
- // `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
- // pure binary representation, whereas JSON representations use base64.
- bytes content = 1 [ctype = CORD];
-
- // URI that points to a file that contains audio data bytes as specified in
- // `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
- // supported, which must be specified in the following format:
- // `gs://bucket_name/object_name` (other URI formats return
- // [google.rpc.Code.INVALID_ARGUMENT][]). For more information, see
- // [Request URIs](/storage/docs/reference-uris).
- string uri = 2;
- }
-}
-
-// `SyncRecognizeResponse` is the only message returned to the client by
-// `SyncRecognize`. It contains the result as zero or more
-// sequential `RecognizeResponse` messages.
-message SyncRecognizeResponse {
- // [Output-only] Sequential list of transcription results corresponding to
- // sequential portions of audio.
- repeated SpeechRecognitionResult results = 2;
-}
-
-// `AsyncRecognizeResponse` is the only message returned to the client by
-// `AsyncRecognize`. It contains the result as zero or more
-// sequential `RecognizeResponse` messages.
-message AsyncRecognizeResponse {
- // [Output-only] Sequential list of transcription results corresponding to
- // sequential portions of audio.
- repeated SpeechRecognitionResult results = 2;
-}
-
-// `StreamingRecognizeResponse` is the only message returned to the client by
-// `StreamingRecognize`. It contains the result as zero or more
-// sequential `RecognizeResponse` messages.
-message StreamingRecognizeResponse {
- // Indicates the type of endpointer event.
- enum EndpointerType {
- // No endpointer event specified.
- ENDPOINTER_EVENT_UNSPECIFIED = 0;
-
- // Speech has been detected in the audio stream.
- START_OF_SPEECH = 1;
-
- // Speech has ceased to be detected in the audio stream.
- END_OF_SPEECH = 2;
-
- // The end of the audio stream has been reached. and it is being processed.
- END_OF_AUDIO = 3;
-
- // This event is only sent when `single_utterance` is `true`. It indicates
- // that the server has detected the end of the user's speech utterance and
- // expects no additional speech. Therefore, the server will not process
- // additional audio. The client should stop sending additional audio data.
- END_OF_UTTERANCE = 4;
- }
-
- // [Output-only] If set, returns a [google.rpc.Status][] message that
- // specifies the error for the operation.
- google.rpc.Status error = 1;
-
- // [Output-only] This repeated list contains zero or more results that
- // correspond to consecutive portions of the audio currently being processed.
- // It contains zero or one `is_final=true` result (the newly settled portion),
- // followed by zero or more `is_final=false` results.
- repeated StreamingRecognitionResult results = 2;
-
- // [Output-only] Indicates the lowest index in the `results` array that has
- // changed. The repeated `SpeechRecognitionResult` results overwrite past
- // results at this index and higher.
- int32 result_index = 3;
-
- // [Output-only] Indicates the type of endpointer event.
- EndpointerType endpointer_type = 4;
-}
-
-// A speech recognition result corresponding to a portion of the audio that is
-// currently being processed.
-// TODO(gshires): add a comment describing the various repeated interim and
-// alternative results fields.
-message StreamingRecognitionResult {
- // [Output-only] May contain one or more recognition hypotheses (up to the
- // maximum specified in `max_alternatives`).
- repeated SpeechRecognitionAlternative alternatives = 1;
-
- // [Output-only] If `false`, this `SpeechRecognitionResult` represents an
- // interim result that may change. If `true`, this is the final time the
- // speech service will return this particular `SpeechRecognitionResult`,
- // the recognizer will not return any further hypotheses for this portion of
- // the transcript and corresponding audio.
- bool is_final = 2;
-
- // [Output-only] An estimate of the probability that the recognizer will not
- // change its guess about this interim result. Values range from 0.0
- // (completely unstable) to 1.0 (completely stable). Note that this is not the
- // same as `confidence`, which estimates the probability that a recognition
- // result is correct.
- // This field is only provided for interim results (`is_final=false`).
- // The default of 0.0 is a sentinel value indicating stability was not set.
- float stability = 3;
-}
-
-// A speech recognition result corresponding to a portion of the audio.
-message SpeechRecognitionResult {
- // [Output-only] May contain one or more recognition hypotheses (up to the
- // maximum specified in `max_alternatives`).
- repeated SpeechRecognitionAlternative alternatives = 1;
-}
-
-// Alternative hypotheses (a.k.a. n-best list).
-message SpeechRecognitionAlternative {
- // [Output-only] Transcript text representing the words that the user spoke.
- string transcript = 1;
-
- // [Output-only] The confidence estimate between 0.0 and 1.0. A higher number
- // means the system is more confident that the recognition is correct.
- // This field is typically provided only for the top hypothesis, and only for
- // `is_final=true` results.
- // The default of 0.0 is a sentinel value indicating confidence was not set.
- float confidence = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/README.md b/speech/grpc/src/main/java/third_party/google/type/README.md
deleted file mode 100644
index f8079ab1ea6..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Google Common Types
-This package contains definitions of common types for Google APIs.
-All types defined in this package are suitable for different APIs to
-exchange data, and will never break binary compatibility. They should
-have design quality comparable to major programming languages like
-Java and C#.
-
-NOTE: Some common types are defined in the package `google.protobuf`
-as they are directly supported by Protocol Buffers compiler and
-runtime. Those types are called Well-Known Types.
diff --git a/speech/grpc/src/main/java/third_party/google/type/color.proto b/speech/grpc/src/main/java/third_party/google/type/color.proto
deleted file mode 100644
index 3e200230d82..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/color.proto
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-import "google/protobuf/wrappers.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "ColorProto";
-option java_package = "com.google.type";
-
-
-// Represents a color in the RGBA color space. This representation is designed
-// for simplicity of conversion to/from color representations in various
-// languages over compactness; for example, the fields of this representation
-// can be trivially provided to the constructor of "java.awt.Color" in Java; it
-// can also be trivially provided to UIColor's "+colorWithRed:green:blue:alpha"
-// method in iOS; and, with just a little work, it can be easily formatted into
-// a CSS "rgba()" string in JavaScript, as well. Here are some examples:
-//
-// Example (Java):
-//
-// import com.google.type.Color;
-//
-// // ...
-// public static java.awt.Color fromProto(Color protocolor) {
-// float alpha = protocolor.hasAlpha()
-// ? protocolor.getAlpha().getValue()
-// : 1.0;
-//
-// return new java.awt.Color(
-// protocolor.getRed(),
-// protocolor.getGreen(),
-// protocolor.getBlue(),
-// alpha);
-// }
-//
-// public static Color toProto(java.awt.Color color) {
-// float red = (float) color.getRed();
-// float green = (float) color.getGreen();
-// float blue = (float) color.getBlue();
-// float denominator = 255.0;
-// Color.Builder resultBuilder =
-// Color
-// .newBuilder()
-// .setRed(red / denominator)
-// .setGreen(green / denominator)
-// .setBlue(blue / denominator);
-// int alpha = color.getAlpha();
-// if (alpha != 255) {
-// result.setAlpha(
-// FloatValue
-// .newBuilder()
-// .setValue(((float) alpha) / denominator)
-// .build());
-// }
-// return resultBuilder.build();
-// }
-// // ...
-//
-// Example (iOS / Obj-C):
-//
-// // ...
-// static UIColor* fromProto(Color* protocolor) {
-// float red = [protocolor red];
-// float green = [protocolor green];
-// float blue = [protocolor blue];
-// FloatValue* alpha_wrapper = [protocolor alpha];
-// float alpha = 1.0;
-// if (alpha_wrapper != nil) {
-// alpha = [alpha_wrapper value];
-// }
-// return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
-// }
-//
-// static Color* toProto(UIColor* color) {
-// CGFloat red, green, blue, alpha;
-// if (![color getRed:&red green:&green blue:&blue alpha:&alpha]) {
-// return nil;
-// }
-// Color* result = [Color alloc] init];
-// [result setRed:red];
-// [result setGreen:green];
-// [result setBlue:blue];
-// if (alpha <= 0.9999) {
-// [result setAlpha:floatWrapperWithValue(alpha)];
-// }
-// [result autorelease];
-// return result;
-// }
-// // ...
-//
-// Example (JavaScript):
-//
-// // ...
-//
-// var protoToCssColor = function(rgb_color) {
-// var redFrac = rgb_color.red || 0.0;
-// var greenFrac = rgb_color.green || 0.0;
-// var blueFrac = rgb_color.blue || 0.0;
-// var red = Math.floor(redFrac * 255);
-// var green = Math.floor(greenFrac * 255);
-// var blue = Math.floor(blueFrac * 255);
-//
-// if (!('alpha' in rgb_color)) {
-// return rgbToCssColor_(red, green, blue);
-// }
-//
-// var alphaFrac = rgb_color.alpha.value || 0.0;
-// var rgbParams = [red, green, blue].join(',');
-// return ['rgba(', rgbParams, ',', alphaFrac, ')'].join('');
-// };
-//
-// var rgbToCssColor_ = function(red, green, blue) {
-// var rgbNumber = new Number((red << 16) | (green << 8) | blue);
-// var hexString = rgbNumber.toString(16);
-// var missingZeros = 6 - hexString.length;
-// var resultBuilder = ['#'];
-// for (var i = 0; i < missingZeros; i++) {
-// resultBuilder.push('0');
-// }
-// resultBuilder.push(hexString);
-// return resultBuilder.join('');
-// };
-//
-// // ...
-//
-message Color {
- // The amount of red in the color as a value in the interval [0, 1].
- float red = 1;
-
- // The amount of green in the color as a value in the interval [0, 1].
- float green = 2;
-
- // The amount of blue in the color as a value in the interval [0, 1].
- float blue = 3;
-
- // The fraction of this color that should be applied to the pixel. That is,
- // the final pixel color is defined by the equation:
- //
- // pixel color = alpha * (this color) + (1.0 - alpha) * (background color)
- //
- // This means that a value of 1.0 corresponds to a solid color, whereas
- // a value of 0.0 corresponds to a completely transparent color. This
- // uses a wrapper message rather than a simple float scalar so that it is
- // possible to distinguish between a default value and the value being unset.
- // If omitted, this color object is to be rendered as a solid color
- // (as if the alpha value had been explicitly given with a value of 1.0).
- google.protobuf.FloatValue alpha = 4;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/date.proto b/speech/grpc/src/main/java/third_party/google/type/date.proto
deleted file mode 100644
index a12090b8a4e..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/date.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-option java_generate_equals_and_hash = true;
-option java_multiple_files = true;
-option java_outer_classname = "DateProto";
-option java_package = "com.google.type";
-
-
-// Represents a whole calendar date, e.g. date of birth. The time of day and
-// time zone are either specified elsewhere or are not significant. The date
-// is relative to the Proleptic Gregorian Calendar. The day may be 0 to
-// represent a year and month where the day is not significant, e.g. credit card
-// expiration date. The year may be 0 to represent a month and day independent
-// of year, e.g. anniversary date. Related types are [google.type.TimeOfDay][google.type.TimeOfDay]
-// and [google.protobuf.Timestamp][google.protobuf.Timestamp].
-message Date {
- // Year of date. Must be from 1 to 9,999, or 0 if specifying a date without
- // a year.
- int32 year = 1;
-
- // Month of year of date. Must be from 1 to 12.
- int32 month = 2;
-
- // Day of month. Must be from 1 to 31 and valid for the year and month, or 0
- // if specifying a year/month where the day is not sigificant.
- int32 day = 3;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/dayofweek.proto b/speech/grpc/src/main/java/third_party/google/type/dayofweek.proto
deleted file mode 100644
index df09f69912b..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/dayofweek.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-option java_generate_equals_and_hash = true;
-option java_multiple_files = true;
-option java_outer_classname = "DayOfWeekProto";
-option java_package = "com.google.type";
-
-
-// Represents a day of week.
-enum DayOfWeek {
- // The unspecified day-of-week.
- DAY_OF_WEEK_UNSPECIFIED = 0;
-
- // The day-of-week of Monday.
- MONDAY = 1;
-
- // The day-of-week of Tuesday.
- TUESDAY = 2;
-
- // The day-of-week of Wednesday.
- WEDNESDAY = 3;
-
- // The day-of-week of Thursday.
- THURSDAY = 4;
-
- // The day-of-week of Friday.
- FRIDAY = 5;
-
- // The day-of-week of Saturday.
- SATURDAY = 6;
-
- // The day-of-week of Sunday.
- SUNDAY = 7;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/latlng.proto b/speech/grpc/src/main/java/third_party/google/type/latlng.proto
deleted file mode 100644
index 198decc0e76..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/latlng.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-option java_generate_equals_and_hash = true;
-option java_multiple_files = true;
-option java_outer_classname = "LatLngProto";
-option java_package = "com.google.type";
-
-
-// An object representing a latitude/longitude pair. This is expressed as a pair
-// of doubles representing degrees latitude and degrees longitude. Unless
-// specified otherwise, this must conform to the
-// WGS84
-// standard. Values must be within normalized ranges.
-message LatLng {
- // The latitude in degrees. It must be in the range [-90.0, +90.0].
- double latitude = 1;
-
- // The longitude in degrees. It must be in the range [-180.0, +180.0].
- double longitude = 2;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/money.proto b/speech/grpc/src/main/java/third_party/google/type/money.proto
deleted file mode 100644
index 041454a23a7..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/money.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-option java_multiple_files = true;
-option java_outer_classname = "MoneyProto";
-option java_package = "com.google.type";
-
-
-// Represents an amount of money with its currency type.
-message Money {
- // The 3-letter currency code defined in ISO 4217.
- string currency_code = 1;
-
- // The whole units of the amount.
- // For example if `currencyCode` is `"USD"`, then 1 unit is one US dollar.
- int64 units = 2;
-
- // Number of nano (10^-9) units of the amount.
- // The value must be between -999,999,999 and +999,999,999 inclusive.
- // If `units` is positive, `nanos` must be positive or zero.
- // If `units` is zero, `nanos` can be positive, zero, or negative.
- // If `units` is negative, `nanos` must be negative or zero.
- // For example $-1.75 is represented as `units`=-1 and `nanos`=-750,000,000.
- int32 nanos = 3;
-}
diff --git a/speech/grpc/src/main/java/third_party/google/type/timeofday.proto b/speech/grpc/src/main/java/third_party/google/type/timeofday.proto
deleted file mode 100644
index f39266e00cf..00000000000
--- a/speech/grpc/src/main/java/third_party/google/type/timeofday.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015, 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.
-
-syntax = "proto3";
-
-package google.type;
-
-option java_generate_equals_and_hash = true;
-option java_multiple_files = true;
-option java_outer_classname = "TimeOfDayProto";
-option java_package = "com.google.type";
-
-
-// Represents a time of day. The date and time zone are either not significant
-// or are specified elsewhere. An API may chose to allow leap seconds. Related
-// types are [google.type.Date][google.type.Date] and [google.protobuf.Timestamp][google.protobuf.Timestamp].
-message TimeOfDay {
- // Hours of day in 24 hour format. Should be from 0 to 23. An API may choose
- // to allow the value "24:00:00" for scenarios like business closing time.
- int32 hours = 1;
-
- // Minutes of hour of day. Must be from 0 to 59.
- int32 minutes = 2;
-
- // Seconds of minutes of the time. Must normally be from 0 to 59. An API may
- // allow the value 60 if it allows leap-seconds.
- int32 seconds = 3;
-
- // Fractions of seconds in nanoseconds. Must be from 0 to 999,999,999.
- int32 nanos = 4;
-}
diff --git a/speech/grpc/src/test/java/com/examples/cloud/speech/RecognitionAudioFactoryTest.java b/speech/grpc/src/test/java/com/examples/cloud/speech/RecognitionAudioFactoryTest.java
deleted file mode 100644
index 0fb30ecfdd0..00000000000
--- a/speech/grpc/src/test/java/com/examples/cloud/speech/RecognitionAudioFactoryTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import static org.junit.Assert.assertEquals;
-
-import com.google.cloud.speech.v1beta1.RecognitionAudio;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-
-/**
- * Unit tests for {@link RecognitionAudioFactory}.
- */
-@RunWith(JUnit4.class)
-public class RecognitionAudioFactoryTest {
-
- @Test
- public void verifyBytesInSizeFromLocalFile() throws IOException {
- URI uri = new File("resources/audio.raw").toURI();
- RecognitionAudio audio = RecognitionAudioFactory.createRecognitionAudio(uri);
-
- int numBytes = audio.getContent().toByteArray().length;
-
- //assert the number of bytes in the audio as 57958
- assertEquals(57958, numBytes);
- }
-
- @Test
- public void verifyBytesInSizeFromGoogleStorageFile() throws IOException {
- String audioUri = "gs://cloud-samples-tests/speech/audio.raw";
-
- URI uri = URI.create(audioUri);
- RecognitionAudio audio = RecognitionAudioFactory.createRecognitionAudio(uri);
-
- int numBytes = audio.getContent().toByteArray().length;
-
- //assert the number of bytes in the audio as 0
- assertEquals(0, numBytes);
-
- //assert the uri
- assertEquals(audioUri, audio.getUri());
- }
-}
diff --git a/speech/grpc/src/test/java/com/examples/cloud/speech/StreamingRecognizeClientTest.java b/speech/grpc/src/test/java/com/examples/cloud/speech/StreamingRecognizeClientTest.java
deleted file mode 100644
index c42e521ebff..00000000000
--- a/speech/grpc/src/test/java/com/examples/cloud/speech/StreamingRecognizeClientTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * 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.examples.cloud.speech;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import io.grpc.ManagedChannel;
-import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.WriterAppender;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-
-/**
- * Unit tests for {@link StreamingRecognizeClient }.
- */
-@RunWith(JUnit4.class)
-public class StreamingRecognizeClientTest {
- private Writer writer;
- private WriterAppender appender;
-
- @Before
- public void setUp() {
- writer = new StringWriter();
- appender = new WriterAppender(new SimpleLayout(), writer);
- Logger.getRootLogger().addAppender(appender);
- }
-
- @After
- public void tearDown() {
- Logger.getRootLogger().removeAppender(appender);
- }
-
- @Test
- public void test16KHzAudio() throws InterruptedException, IOException {
- URI uri = new File("resources/audio.raw").toURI();
- Path path = Paths.get(uri);
-
- String host = "speech.googleapis.com";
- int port = 443;
- ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
- StreamingRecognizeClient client = new StreamingRecognizeClient(channel, path.toString(), 16000);
-
- client.recognize();
- assertThat(writer.toString()).contains("transcript: \"how old is the Brooklyn Bridge\"");
- }
-
- @Test
- public void test32KHzAudio() throws InterruptedException, IOException {
- URI uri = new File("resources/audio32KHz.raw").toURI();
- Path path = Paths.get(uri);
-
- String host = "speech.googleapis.com";
- int port = 443;
- ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
- StreamingRecognizeClient client = new StreamingRecognizeClient(channel, path.toString(), 32000);
-
- client.recognize();
- assertThat(writer.toString()).contains("transcript: \"how old is the Brooklyn Bridge\"");
- }
-}
diff --git a/storage/json-api/README.md b/storage/json-api/README.md
deleted file mode 100644
index a7ead2b75f1..00000000000
--- a/storage/json-api/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Google Cloud Storage (GCS) and the Google Java API Client library
-
-Google Cloud Storage Service features a REST-based API that allows developers to store and access arbitrarily-large objects. These sample Java applications demonstrate how to access the Google Cloud Storage JSON API using the Google Java API Client Libraries. For more information, read the [Google Cloud Storage JSON API Overview][1].
-
-## Quickstart
-
-1. Install the [Google Cloud SDK](https://cloud.google.com/sdk/), including the [gcloud tool](https://cloud.google.com/sdk/gcloud/).
-
-1. Setup the gcloud tool.
-
- ```
- gcloud init
- ```
-
-1. Clone this repo.
-
- ```
- git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
- ```
-
-1. Install [Maven](http://maven.apache.org/).
-
-1. Build this project from this directory:
-
- ```
- mvn package
- ```
-
-1. Run one of the sample apps by specifying its class name and a bucket name:
-
- ```
- mvn exec:java -Dexec.mainClass=StorageSample \
- -Dexec.args="ABucketName"
- ```
-
-Note that if it's been a while, you may need to login with gcloud.
-
- ```
- gcloud auth login
- ```
-
-## Products
-- [Google Cloud Storage][2]
-
-## Language
-- [Java][3]
-
-## Dependencies
-- [Google APIs Client Library for Java][4]
-
-[1]: https://cloud.google.com/storage/docs/json_api
-[2]: https://cloud.google.com/storage
-[3]: https://java.com
-[4]: http://code.google.com/p/google-api-java-client/
-
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
deleted file mode 100644
index c7348d386ff..00000000000
--- a/storage/json-api/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- doc-samples
- com.google.cloud
- 1.0.0
- ../..
-
-
- 4.0.0
- com.google.apis-samples
- storage-json-sample
- 1
- Sample accessing the Google Cloud Storage JSON API using OAuth 2.0.
-
-
- 1.8
- 1.8
-
-
-
- ${project.artifactId}-${project.version}
-
-
-
-
![AppEngine logo](http://storage.cloud.google.com/" + bucket
- + "/image.jpeg)
");
- out.println("![AppEngine logo resized](http://storage.cloud.google.com/" + bucket
- + "/resizedImage.jpeg)
");
- out.println("![AppEngine logo rotated](http://storage.cloud.google.com/" + bucket
- + "/rotatedImage.jpeg)
");
- out.println("\n");
- }
-}
-// [END example]
diff --git a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
deleted file mode 100644
index 07bb4d7de99..00000000000
--- a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
"
- + "
"
- + "