update Springboot to use application.properties for port (GoogleCloudPlatform#3343)

averikitsch · web-flow · commit 36f5996d66e5 · 2020-07-10T15:30:21.000-07:00
diff --git a/run/events-pubsub/src/main/java/com/example/cloudrun/Application.java b/run/events-pubsub/src/main/java/com/example/cloudrun/Application.java
@@ -23,8 +23,6 @@
 @SpringBootApplication
 public class Application {
   public static void main(String[] args) {
-    String port = System.getenv().getOrDefault("PORT", "8080");
-    System.setProperty("server.port", port);
     SpringApplication.run(Application.class, args);
   }
 }
diff --git a/run/events-pubsub/src/main/resources/application.properties b/run/events-pubsub/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+#  Copyright 2020 Google LLC
+#
+#  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.
+server.port=${PORT:8080}
diff --git a/run/events-storage/src/main/java/com/example/cloudrun/Application.java b/run/events-storage/src/main/java/com/example/cloudrun/Application.java
@@ -23,8 +23,6 @@
 @SpringBootApplication
 public class Application {
   public static void main(String[] args) {
-    String port = System.getenv().getOrDefault("PORT", "8080");
-    System.setProperty("server.port", port);
     SpringApplication.run(Application.class, args);
   }
 }
diff --git a/run/events-storage/src/main/resources/application.properties b/run/events-storage/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+#  Copyright 2020 Google LLC
+#
+#  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.
+server.port=${PORT:8080}
diff --git a/run/helloworld/src/main/java/com/example/helloworld/HelloworldApplication.java b/run/helloworld/src/main/java/com/example/helloworld/HelloworldApplication.java
@@ -37,8 +37,6 @@ String hello() {
   }
 
   public static void main(String[] args) {
-    String port = System.getenv().getOrDefault("PORT", "8080");
-    System.setProperty("server.port", port);
     SpringApplication.run(HelloworldApplication.class, args);
   }
 }
diff --git a/run/helloworld/src/main/resources/application.properties b/run/helloworld/src/main/resources/application.properties
@@ -11,3 +11,4 @@
 #  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.
+server.port=${PORT:8080}
diff --git a/run/image-processing/src/main/java/com/example/cloudrun/PubSubApplication.java b/run/image-processing/src/main/java/com/example/cloudrun/PubSubApplication.java
@@ -22,8 +22,6 @@
 @SpringBootApplication
 public class PubSubApplication {
   public static void main(String[] args) {
-    String port = System.getenv().getOrDefault("PORT", "8080");
-    System.setProperty("server.port", port);
     SpringApplication.run(PubSubApplication.class, args);
   }
 }
diff --git a/run/image-processing/src/main/resources/application.properties b/run/image-processing/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+#  Copyright 2020 Google LLC
+#
+#  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.
+server.port=${PORT:8080}
diff --git a/run/markdown-preview/editor/src/main/java/com/example/cloudrun/EditorApplication.java b/run/markdown-preview/editor/src/main/java/com/example/cloudrun/EditorApplication.java
@@ -28,16 +28,9 @@ public class EditorApplication {
   private static final Logger logger = LoggerFactory.getLogger(EditorApplication.class);
 
   public static void main(String[] args) {
-    String port = System.getenv("PORT");
-    if (port == null) {
-      port = "8080";
-      logger.warn("Defaulting to port " + port);
-    }
-    SpringApplication app = new SpringApplication(EditorApplication.class);
-    app.setDefaultProperties(Collections.singletonMap("server.port", port));
-
     // Start the Spring Boot application.
-    app.run(args);
+    SpringApplication.run(EditorApplication.class, args);
+    String port = System.getenv().getOrDefault("PORT", "8080");
     logger.info("Listening on port " + port);
   }
 }
diff --git a/run/markdown-preview/editor/src/main/resources/application.properties b/run/markdown-preview/editor/src/main/resources/application.properties
@@ -11,3 +11,4 @@
 # 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.
+server.port=${PORT:8080}
diff --git a/run/markdown-preview/renderer/src/main/java/com/example/cloudrun/RendererApplication.java b/run/markdown-preview/renderer/src/main/java/com/example/cloudrun/RendererApplication.java
@@ -28,16 +28,9 @@ public class RendererApplication {
   private static final Logger logger = LoggerFactory.getLogger(RendererApplication.class);
 
   public static void main(String[] args) {
-    String port = System.getenv("PORT");
-    if (port == null) {
-      port = "8080";
-      logger.warn("Defaulting to port " + port);
-    }
-    SpringApplication app = new SpringApplication(RendererApplication.class);
-    app.setDefaultProperties(Collections.singletonMap("server.port", port));
-
     // Start the Spring Boot application.
-    app.run(args);
+    SpringApplication.run(RendererApplication.class, args);
+    String port = System.getenv().getOrDefault("PORT", "8080");
     logger.info("Listening on port " + port);
   }
 }
diff --git a/run/markdown-preview/renderer/src/main/resources/application.properties b/run/markdown-preview/renderer/src/main/resources/application.properties
@@ -1,13 +1,14 @@
- # Copyright 2020 Google LLC
- #
- # 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.
+# Copyright 2020 Google LLC
+#
+# 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.
+server.port=${PORT:8080}
diff --git a/run/pubsub/src/main/java/com/example/cloudrun/PubSubApplication.java b/run/pubsub/src/main/java/com/example/cloudrun/PubSubApplication.java
@@ -23,8 +23,6 @@
 @SpringBootApplication
 public class PubSubApplication {
   public static void main(String[] args) {
-    String port = System.getenv().getOrDefault("PORT", "8080");
-    System.setProperty("server.port", port);
     SpringApplication.run(PubSubApplication.class, args);
   }
 }
diff --git a/run/pubsub/src/main/resources/application.properties b/run/pubsub/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+#  Copyright 2020 Google LLC
+#
+#  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.
+server.port=${PORT:8080}

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`@SpringBootApplication`
`24`	`24`	`public class Application {`
`25`	`25`	`public static void main(String[] args) {`
`26`		`- String port = System.getenv().getOrDefault("PORT", "8080");`
`27`		`- System.setProperty("server.port", port);`
`28`	`26`	`SpringApplication.run(Application.class, args);`
`29`	`27`	`}`
`30`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ String hello() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public static void main(String[] args) {`
`40`		`- String port = System.getenv().getOrDefault("PORT", "8080");`
`41`		`- System.setProperty("server.port", port);`
`42`	`40`	`SpringApplication.run(HelloworldApplication.class, args);`
`43`	`41`	`}`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`@SpringBootApplication`
`23`	`23`	`public class PubSubApplication {`
`24`	`24`	`public static void main(String[] args) {`
`25`		`- String port = System.getenv().getOrDefault("PORT", "8080");`
`26`		`- System.setProperty("server.port", port);`
`27`	`25`	`SpringApplication.run(PubSubApplication.class, args);`
`28`	`26`	`}`
`29`	`27`	`}`