✨ Camel Spring Boot on Tomcat App/Product by Croway · Pull Request #981 · tnb-software/TNB

Croway · 2024-05-09T13:44:39Z

No description provided.

github-actions · 2024-05-09T13:45:22Z

fuse-products/src/main/java/software/tnb/product/util/ZipUtils.java

+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class ZipUtils {


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck> _{reported by reviewdog 🐶}
Utility classes should not have a public or default constructor.

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/main/java/software/tnb/product/csb/TomcatCamelSpringBoot.java

+
+import com.google.auto.service.AutoService;
+
+import software.tnb.product.LocalProduct;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> _{reported by reviewdog 🐶}
Wrong order for 'software.tnb.product.LocalProduct' import.

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+package software.tnb.product.csb.application;
+
+import software.tnb.common.config.TestConfiguration;
+import software.tnb.common.utils.WaitUtils;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - software.tnb.common.utils.WaitUtils.

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - java.nio.file.Paths.

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+        try {
+            tomcatProcess = processBuilder.start();
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                if(tomcatProcess != null) {


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck> _{reported by reviewdog 🐶}
'if' is not followed by whitespace.

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+                    class MySpringBootApplication extends org.springframework.boot.web.servlet.support.SpringBootServletInitializer {
+
+                        @Override
+                        protected org.springframework.boot.builder.SpringApplicationBuilder configure(org.springframework.boot.builder.SpringApplicationBuilder application) {


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 150 characters (found 174).

github-actions · 2024-05-09T13:45:23Z

fuse-products/src/test/java/software/tnb/product/TomcatSpringBootTest.java

+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import software.tnb.common.utils.WaitUtils;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> _{reported by reviewdog 🐶}
Wrong order for 'software.tnb.common.utils.WaitUtils' import.

github-actions · 2024-05-09T14:01:43Z

fuse-products/src/main/java/software/tnb/product/util/ZipUtils.java

+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class ZipUtils {


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck> _{reported by reviewdog 🐶}
Class ZipUtils should be declared as final.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/TomcatCamelSpringBoot.java

+
+import com.google.auto.service.AutoService;
+
+import software.tnb.product.util.maven.Maven;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> _{reported by reviewdog 🐶}
Wrong order for 'software.tnb.product.util.maven.Maven' import.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+package software.tnb.product.csb.application;
+
+import software.tnb.common.config.TestConfiguration;
+import software.tnb.product.application.App;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - software.tnb.product.application.App.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import software.tnb.product.application.App;
+import software.tnb.product.application.Phase;
+import software.tnb.product.csb.configuration.SpringBootConfiguration;
+import software.tnb.product.customizer.Customizer;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - software.tnb.product.customizer.Customizer.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import software.tnb.product.application.Phase;
+import software.tnb.product.csb.configuration.SpringBootConfiguration;
+import software.tnb.product.customizer.Customizer;
+import software.tnb.product.customizer.component.rest.RestCustomizer;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - software.tnb.product.customizer.component.rest.RestCustomizer.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import software.tnb.product.util.maven.Maven;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.model.Dependency;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - org.apache.maven.model.Dependency.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - java.util.List.

github-actions · 2024-05-09T14:53:42Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;


🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> _{reported by reviewdog 🐶}
Unused import - java.util.stream.Collectors.

avano · 2024-05-10T05:04:13Z

fuse-products/src/main/java/software/tnb/product/csb/TomcatCamelSpringBoot.java

+    @Override
+    public void setupProduct() {
+        super.setupProduct();
+    }


not necessary here since it only calls super

avano · 2024-05-10T05:07:11Z

fuse-products/src/main/java/software/tnb/product/csb/TomcatCamelSpringBoot.java

+    @Override
+    public void teardownProduct() {
+        app.stop();
+    }


apps are stopped via Product#removeIntegrations

avano · 2024-05-10T05:08:17Z

fuse-products/src/main/java/software/tnb/product/csb/TomcatCamelSpringBoot.java

+
+    @Override
+    public App createIntegrationApp(AbstractIntegrationBuilder<?> integrationBuilder) {
+        // Let's remove restcustomizer, since it exclude tomcat


I'd say restcustomizer (and all customizers) should be changed to handle the tomcat as well, rather than changing it here

avano · 2024-05-10T05:11:12Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+public class TomcatSpringBootApp extends SpringBootApp {
+    private static final Logger LOG = LoggerFactory.getLogger(TomcatSpringBootApp.class);
+
+    private AbstractIntegrationBuilder<?> integrationBuilder;


not used for anything

avano · 2024-05-10T05:13:46Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+    private static final String TOMCAT_ARCHIVE_NAME = "tomcat-archive.zip";
+
+    @Override
+    public Log getLog() {


set the log variable after the app is started, instead of overriding this method

avano · 2024-05-10T05:20:43Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+            Path pomPath = TestConfiguration.appLocation().resolve(name).resolve("pom.xml");
+            String pom = Files.readString(pomPath);
+            pom = pom.replace("<artifactId>" + name + "</artifactId>",
+                "<artifactId>" + name + "</artifactId><packaging>war</packaging>");
+            Files.write(pomPath, pom.getBytes(StandardCharsets.UTF_8));
+
+            Path mainPath = TestConfiguration.appLocation().resolve(name)
+                .resolve("src")
+                .resolve("main")
+                .resolve("java")
+                .resolve("com")
+                .resolve("test")
+                .resolve("MySpringBootApplication.java");
+            String main = Files.readString(mainPath);
+
+            main = main.replace("class MySpringBootApplication {",
+                """
+                    class MySpringBootApplication extends org.springframework.boot.web.servlet.support.SpringBootServletInitializer {
+
+                        @Override
+                        protected org.springframework.boot.builder.SpringApplicationBuilder 
+                                configure(org.springframework.boot.builder.SpringApplicationBuilder application) {
+                            return application.sources(MySpringBootApplication.class);
+                        }
+                    """);


if this is something that should be done for all tomcat apps, it should be done by a TomcatCustomizer

avano · 2024-05-10T05:23:52Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+                    """);
+            Files.write(mainPath, main.getBytes(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(e);


throw new RuntimeException("Unable to start application", e);

avano · 2024-05-10T05:24:01Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+
+            ZipUtils.unzip(tomcatTmpDirectory.resolve(TOMCAT_ARCHIVE_NAME), tomcatTmpDirectory.resolve(TOMCAT_PARENT_DIRECTORY));
+        } catch (IOException e) {
+            throw new RuntimeException(e);


throw new RuntimeException("Unable to download tomcat", e);

avano · 2024-05-10T05:25:52Z

fuse-products/src/main/java/software/tnb/product/csb/application/TomcatSpringBootApp.java

+            Files.copy(TestConfiguration.appLocation().resolve(name).resolve("target").resolve(warName),
+                tomcatHome.resolve("webapps").resolve(warName));
+        } catch (IOException e) {
+            throw new RuntimeException(e);


throw new RuntimeException("Unable to copy file", e);

avano · 2024-05-10T05:28:36Z

fuse-products/src/main/java/software/tnb/product/csb/configuration/SpringBootConfiguration.java

    }
+
+    public static String tomcatZipUrl() {
+        return getProperty(TOMCAT_ZIP_DOWNLOAD_URL, "https://dlcdn.apache.org/tomcat/tomcat-10/v10.1.23/bin/apache-tomcat-10.1.23.zip");


shouldn't the version be configurable?

Croway requested review from avano and mcarlett May 9, 2024 13:44

github-actions bot reviewed May 9, 2024

View reviewed changes

Croway force-pushed the springboot-tomcat branch 2 times, most recently from d8b6f09 to 227bcbd Compare May 9, 2024 13:50

✨ Camel Spring Boot on Tomcat App/Product

ab49566

Croway force-pushed the springboot-tomcat branch from 227bcbd to ab49566 Compare May 9, 2024 14:01

github-actions bot reviewed May 9, 2024

View reviewed changes

Extend SpringBootApp

5f03e0a

github-actions bot reviewed May 9, 2024

View reviewed changes

avano requested changes May 10, 2024

View reviewed changes


		import com.google.auto.service.AutoService;

		import software.tnb.product.LocalProduct;


		import com.google.auto.service.AutoService;

		import software.tnb.product.util.maven.Maven;

Conversation

Croway commented May 9, 2024

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot May 9, 2024

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants