✨ Camel Spring Boot on Tomcat App/Product #981
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| import java.util.zip.ZipEntry; | ||
| import java.util.zip.ZipInputStream; | ||
|
|
||
| public class ZipUtils { |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck> reported by reviewdog 🐶
Utility classes should not have a public or default constructor.
|
|
||
| import com.google.auto.service.AutoService; | ||
|
|
||
| import software.tnb.product.LocalProduct; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> reported by reviewdog 🐶
Wrong order for 'software.tnb.product.LocalProduct' import.
| package software.tnb.product.csb.application; | ||
|
|
||
| import software.tnb.common.config.TestConfiguration; | ||
| import software.tnb.common.utils.WaitUtils; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - software.tnb.common.utils.WaitUtils.
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - java.nio.file.Paths.
| try { | ||
| tomcatProcess = processBuilder.start(); | ||
| Runtime.getRuntime().addShutdownHook(new Thread(() -> { | ||
| if(tomcatProcess != null) { |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck> reported by reviewdog 🐶
'if' is not followed by whitespace.
| class MySpringBootApplication extends org.springframework.boot.web.servlet.support.SpringBootServletInitializer { | ||
|
|
||
| @Override | ||
| protected org.springframework.boot.builder.SpringApplicationBuilder configure(org.springframework.boot.builder.SpringApplicationBuilder application) { |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> reported by reviewdog 🐶
Line is longer than 150 characters (found 174).
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import software.tnb.common.utils.WaitUtils; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> reported by reviewdog 🐶
Wrong order for 'software.tnb.common.utils.WaitUtils' import.
Croway
force-pushed
the
springboot-tomcat
branch
2 times, most recently
from
d8b6f09 to
227bcbd
Compare
| import java.util.zip.ZipEntry; | ||
| import java.util.zip.ZipInputStream; | ||
|
|
||
| public class ZipUtils { |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck> reported by reviewdog 🐶
Class ZipUtils should be declared as final.
|
|
||
| import com.google.auto.service.AutoService; | ||
|
|
||
| import software.tnb.product.util.maven.Maven; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck> reported by reviewdog 🐶
Wrong order for 'software.tnb.product.util.maven.Maven' import.
| package software.tnb.product.csb.application; | ||
|
|
||
| import software.tnb.common.config.TestConfiguration; | ||
| import software.tnb.product.application.App; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - software.tnb.product.application.App.
| 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; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - software.tnb.product.customizer.Customizer.
| 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; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - software.tnb.product.customizer.component.rest.RestCustomizer.
| import software.tnb.product.util.maven.Maven; | ||
|
|
||
| import org.apache.commons.io.FileUtils; | ||
| import org.apache.maven.model.Dependency; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - org.apache.maven.model.Dependency.
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.List; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - java.util.List.
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; |
There was a problem hiding this comment.
🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - java.util.stream.Collectors.
| @Override | ||
| public void setupProduct() { | ||
| super.setupProduct(); | ||
| } |
There was a problem hiding this comment.
not necessary here since it only calls super
| @Override | ||
| public void teardownProduct() { | ||
| app.stop(); | ||
| } |
There was a problem hiding this comment.
apps are stopped via Product#removeIntegrations
|
|
||
| @Override | ||
| public App createIntegrationApp(AbstractIntegrationBuilder<?> integrationBuilder) { | ||
| // Let's remove restcustomizer, since it exclude tomcat |
There was a problem hiding this comment.
I'd say restcustomizer (and all customizers) should be changed to handle the tomcat as well, rather than changing it here
| public class TomcatSpringBootApp extends SpringBootApp { | ||
| private static final Logger LOG = LoggerFactory.getLogger(TomcatSpringBootApp.class); | ||
|
|
||
| private AbstractIntegrationBuilder<?> integrationBuilder; |
| private static final String TOMCAT_ARCHIVE_NAME = "tomcat-archive.zip"; | ||
|
|
||
| @Override | ||
| public Log getLog() { |
There was a problem hiding this comment.
set the log variable after the app is started, instead of overriding this method
| 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); | ||
| } | ||
| """); |
There was a problem hiding this comment.
if this is something that should be done for all tomcat apps, it should be done by a TomcatCustomizer
| """); | ||
| Files.write(mainPath, main.getBytes(StandardCharsets.UTF_8)); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); |
There was a problem hiding this comment.
throw new RuntimeException("Unable to start application", e);
|
|
||
| ZipUtils.unzip(tomcatTmpDirectory.resolve(TOMCAT_ARCHIVE_NAME), tomcatTmpDirectory.resolve(TOMCAT_PARENT_DIRECTORY)); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); |
There was a problem hiding this comment.
throw new RuntimeException("Unable to download tomcat", e);
| Files.copy(TestConfiguration.appLocation().resolve(name).resolve("target").resolve(warName), | ||
| tomcatHome.resolve("webapps").resolve(warName)); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); |
There was a problem hiding this comment.
throw new RuntimeException("Unable to copy file", e);
| @@ -104,4 +107,12 @@ public static String openshiftBaseImage() { | |||
| public static String openshiftResultImageRepository() { | |||
| return getProperty(OPENSHIFT_SB_RESULT_IMAGE_REPOSITORY); | |||
| } | |||
|
|
|||
| 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"); | |||
There was a problem hiding this comment.
shouldn't the version be configurable?
No description provided.