From fd155e81f503c24f38e9098c321763c5fb00de3e Mon Sep 17 00:00:00 2001 From: i0n- Date: Fri, 12 Jul 2019 10:05:35 -0700 Subject: [PATCH 01/12] Fix the 8080 Warning Uses the PORT environment variable when is present, otherwise sets 8080. --- appengine-java11/custom-entrypoint/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appengine-java11/custom-entrypoint/Main.java b/appengine-java11/custom-entrypoint/Main.java index 7f83c5c3c76..5f3bc50b283 100644 --- a/appengine-java11/custom-entrypoint/Main.java +++ b/appengine-java11/custom-entrypoint/Main.java @@ -24,7 +24,11 @@ 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); + HttpServer server = HttpServer.create(new InetSocketAddress( + System.getenv().containsKey("PORT") + ? Integer.parseInt(System.getenv().get("PORT")) + : 8080 + ), 0); // Set root URI path. server.createContext("/", (var t) -> { From 5ca68ccf8b55a5576606f43c420c9fb1dfd0c722 Mon Sep 17 00:00:00 2001 From: i0n- Date: Fri, 12 Jul 2019 10:44:17 -0700 Subject: [PATCH 02/12] Update Main.java --- .../java/com/example/appengine/demo/jettymain/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index 8007fc05740..6e1ffcfbfce 100644 --- 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 @@ -36,7 +36,11 @@ public static void main(String[] args) throws Exception { // 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); + Server server = new Server( + System.getenv().containsKey("PORT") + ? Integer.parseInt(System.getenv().get("PORT")) + : 8080 + ); // The WebAppContext is the interface to provide configuration for a web // application. In this example, the context path is being set to "/" so From 09c1bc3200488bc1979a52641aa5754ea660a0fb Mon Sep 17 00:00:00 2001 From: i0n- Date: Fri, 12 Jul 2019 11:00:02 -0700 Subject: [PATCH 03/12] Update Main.java --- .../src/main/java/com/example/appengine/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index b0bbfb76f7e..ace2c2cec1c 100644 --- 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 @@ -25,7 +25,11 @@ 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); + HttpServer server = HttpServer.create(new InetSocketAddress( + System.getenv().containsKey("PORT") + ? Integer.parseInt(System.getenv().get("PORT")) + : 8080 + ), 0); // Set root URI path. server.createContext("/", (var t) -> { From 2dd548c801b501023cbbcb6e1a02e9c6706014b1 Mon Sep 17 00:00:00 2001 From: i0n- Date: Fri, 12 Jul 2019 11:06:23 -0700 Subject: [PATCH 04/12] Update Main.java --- .../src/main/java/com/example/appengine/sparkdemo/Main.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index c57002227bf..3256b7993b1 100644 --- 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 @@ -22,7 +22,11 @@ public class Main { public static void main(String[] args) { // Starts the webapp on localhost:8080. - Spark.port(8080); + Spark.port( + System.getenv().containsKey("PORT") + ? Integer.parseInt(System.getenv().get("PORT")) + : 8080 + ); Spark.get("/", (req, res) -> "Hello World!"); } } From 66bd2496db9dd0fcc31462700039e224174b158f Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 10:42:41 -0700 Subject: [PATCH 05/12] Update Main.java --- .../com/example/appengine/demo/jettymain/Main.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 index 6e1ffcfbfce..52b4e52def3 100644 --- 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,15 +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 is 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( - System.getenv().containsKey("PORT") - ? Integer.parseInt(System.getenv().get("PORT")) - : 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 From 5724b170b530d957a6f9fef5107718286666a43e Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 10:50:08 -0700 Subject: [PATCH 06/12] Update Main.java --- appengine-java11/custom-entrypoint/Main.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/appengine-java11/custom-entrypoint/Main.java b/appengine-java11/custom-entrypoint/Main.java index 5f3bc50b283..08ab871bc64 100644 --- a/appengine-java11/custom-entrypoint/Main.java +++ b/appengine-java11/custom-entrypoint/Main.java @@ -23,12 +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( - System.getenv().containsKey("PORT") - ? Integer.parseInt(System.getenv().get("PORT")) - : 8080 - ), 0); + // Create an instance of HttpServer bound to port defined by the + // PORT environment variable when is 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) -> { From 6fea7bf8e1b56c864b8d8da4a3211166f7c5167a Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 10:52:59 -0700 Subject: [PATCH 07/12] Update Main.java --- .../src/main/java/com/example/appengine/Main.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 index ace2c2cec1c..2fdd46354cd 100644 --- 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,12 +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( - System.getenv().containsKey("PORT") - ? Integer.parseInt(System.getenv().get("PORT")) - : 8080 - ), 0); + // Create an instance of HttpServer bound to port defined by the + // PORT environment variable when is 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) -> { From 6cd8e2b4e932a29f73ce51c98fe7319a98087cec Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 10:57:41 -0700 Subject: [PATCH 08/12] Update Main.java --- .../java/com/example/appengine/sparkdemo/Main.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 index 3256b7993b1..c8da1882986 100644 --- 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,12 +21,10 @@ public class Main { public static void main(String[] args) { - // Starts the webapp on localhost:8080. - Spark.port( - System.getenv().containsKey("PORT") - ? Integer.parseInt(System.getenv().get("PORT")) - : 8080 - ); + // Starts the webapp on localhost and the port defined by the PORT + // environment variable when is present, otherwise on 8080. + int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080")); + Spark.port(port); Spark.get("/", (req, res) -> "Hello World!"); } } From 43b84dc14de4d911f7a14f57fc1335f852baf02a Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 11:13:56 -0700 Subject: [PATCH 09/12] Update appengine-java11/appengine-simple-jetty-main/src/main/java/com/example/appengine/demo/jettymain/Main.java Co-Authored-By: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> --- .../main/java/com/example/appengine/demo/jettymain/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 52b4e52def3..6ade0c93a23 100644 --- 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 @@ -33,7 +33,7 @@ public static void main(String[] args) throws Exception { System.setProperty("org.eclipse.jetty.LEVEL", "INFO"); // Create a basic Jetty server object that will listen on port defined by - // the PORT environment variable when is present, otherwise on 8080. + // 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. From 8eb7f68db566978176e54f058b0e565ea7f9268a Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 11:33:02 -0700 Subject: [PATCH 10/12] Update appengine-java11/custom-entrypoint/Main.java Co-Authored-By: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> --- appengine-java11/custom-entrypoint/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine-java11/custom-entrypoint/Main.java b/appengine-java11/custom-entrypoint/Main.java index 08ab871bc64..e33298d9ead 100644 --- a/appengine-java11/custom-entrypoint/Main.java +++ b/appengine-java11/custom-entrypoint/Main.java @@ -24,7 +24,7 @@ public class Main { public static void main(String[] args) throws IOException { // Create an instance of HttpServer bound to port defined by the - // PORT environment variable when is present, otherwise on 8080. + // 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); From f30f909e393f731d63383fe92909cd546c509855 Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 11:33:22 -0700 Subject: [PATCH 11/12] Update Main.java --- .../http-server/src/main/java/com/example/appengine/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 2fdd46354cd..f6d1b41527d 100644 --- 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 @@ -25,7 +25,7 @@ public class Main { public static void main(String[] args) throws IOException { // Create an instance of HttpServer bound to port defined by the - // PORT environment variable when is present, otherwise on 8080. + // 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); From e2aceccc3720bef84e1666abb106bd12c44b2d9a Mon Sep 17 00:00:00 2001 From: i0n- Date: Tue, 16 Jul 2019 11:33:41 -0700 Subject: [PATCH 12/12] Update Main.java --- .../src/main/java/com/example/appengine/sparkdemo/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index c8da1882986..994dde0a57a 100644 --- 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 @@ -22,7 +22,7 @@ public class Main { public static void main(String[] args) { // Starts the webapp on localhost and the port defined by the PORT - // environment variable when is present, otherwise on 8080. + // 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!");