Merge branch 'master' into move-samples

nnegrey · web-flow · commit 132317f50d2d · 2019-07-18T11:12:07.000-06:00
diff --git a/appengine-java11/appengine-simple-jetty-main/src/main/java/com/example/appengine/demo/jettymain/Main.java b/appengine-java11/appengine-simple-jetty-main/src/main/java/com/example/appengine/demo/jettymain/Main.java
@@ -32,11 +32,13 @@ public static void main(String[] args) throws Exception {
     System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StrErrLog");
     System.setProperty("org.eclipse.jetty.LEVEL", "INFO");
 
-    // Create a basic Jetty server object that will listen on port 8080.
+    // Create a basic Jetty server object that will listen on port defined by
+    // the PORT environment variable when present, otherwise on 8080.
     // Note: If you set this to port 0, a randomly available port will be
     // assigned. You can find the assigned port in the logs or programmatically
     // obtain it.
-    Server server = new Server(8080);
+    int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));
+    Server server = new Server(port);
 
     // The WebAppContext is the interface to provide configuration for a web
     // application. In this example, the context path is being set to "/" so
diff --git a/appengine-java11/custom-entrypoint/Main.java b/appengine-java11/custom-entrypoint/Main.java
@@ -23,8 +23,10 @@
 public class Main {
 
   public static void main(String[] args) throws IOException {
-    // Create an instance of HttpServer bound to port 8080.
-    HttpServer server = HttpServer.create(new InetSocketAddress(8080), 0);
+    // Create an instance of HttpServer bound to port defined by the 
+    // PORT environment variable when present, otherwise on 8080.
+    int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));
+    HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
 
     // Set root URI path.
     server.createContext("/", (var t) -> {
diff --git a/appengine-java11/http-server/src/main/java/com/example/appengine/Main.java b/appengine-java11/http-server/src/main/java/com/example/appengine/Main.java
@@ -24,8 +24,10 @@
 public class Main {
 
   public static void main(String[] args) throws IOException {
-    // Create an instance of HttpServer with port 8080.
-    HttpServer server = HttpServer.create(new InetSocketAddress(8080), 0);
+    // Create an instance of HttpServer bound to port defined by the 
+    // PORT environment variable when present, otherwise on 8080.
+    int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));
+    HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
 
     // Set root URI path.
     server.createContext("/", (var t) -> {
diff --git a/appengine-java11/sparkjava-helloworld/src/main/java/com/example/appengine/sparkdemo/Main.java b/appengine-java11/sparkjava-helloworld/src/main/java/com/example/appengine/sparkdemo/Main.java
@@ -21,8 +21,10 @@
 public class Main {
 
   public static void main(String[] args) {
-    // Starts the webapp on localhost:8080.
-    Spark.port(8080);
+    // Starts the webapp on localhost and the port defined by the PORT
+    // environment variable when present, otherwise on 8080.
+    int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));
+    Spark.port(port);
     Spark.get("/", (req, res) -> "Hello World!");
   }
 }
diff --git a/speech/cloud-client/README.md b/speech/cloud-client/README.md
@@ -14,6 +14,16 @@ using the [Google Cloud Client Library for Java][google-cloud-java].
 
 ## Setup
 
+Before you begin, complete the following steps as listed on the [Speech-to-Text Docs pages for Getting Started](https://cloud.google.com/speech-to-text/docs/quickstart-client-libraries#before-you-begin)
+ * Create or select a project.
+ * Enable the Google Speech-to-Text API for that project.
+ * Create a service account.
+ * Download a private key as JSON.
+ * Set `GOOGLE_APPLICATION_CREDENTIALS`
+  ```
+  export GOOGLE_APPLICATION_CREDENTIALS=path_to_your_downloaded_json_file
+  ```
+
 Install [Maven](http://maven.apache.org/).
 
 Build your project with:

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@`
`21`	`21`	`public class Main {`
`22`	`22`
`23`	`23`	`public static void main(String[] args) {`
`24`		`- // Starts the webapp on localhost:8080.`
`25`		`- Spark.port(8080);`
	`24`	`+ // Starts the webapp on localhost and the port defined by the PORT`
	`25`	`+ // environment variable when present, otherwise on 8080.`
	`26`	`+ int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));`
	`27`	`+ Spark.port(port);`
`26`	`28`	`Spark.get("/", (req, res) -> "Hello World!");`
`27`	`29`	`}`
`28`	`30`	`}`