Merge branch 'webb/e2e_tests_with_tomcat' of github.com:getsentry/sentry-java into webb/e2e_tests_with_tomcat

alexander-alderman-webb · alexander-alderman-webb · commit 506baad0c4f2 · 2025-08-13T10:49:55.000+02:00
diff --git a/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/Main.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/Main.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.startup.Tomcat;
 
@@ -13,7 +12,8 @@ public static void main(String[] args) throws LifecycleException, IOException {
     if (!webappsDirectory.exists()) {
       boolean didCreateDirectories = webappsDirectory.mkdirs();
       if (!didCreateDirectories) {
-        throw new RuntimeException("Failed to create directory required by Tomcat: " + webappsDirectory.getAbsolutePath());
+        throw new RuntimeException(
+            "Failed to create directory required by Tomcat: " + webappsDirectory.getAbsolutePath());
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.io.File;`
`4`	`4`	`import java.io.IOException;`
`5`		`-`
`6`	`5`	`import org.apache.catalina.LifecycleException;`
`7`	`6`	`import org.apache.catalina.startup.Tomcat;`
`8`	`7`
`@@ -13,7 +12,8 @@ public static void main(String[] args) throws LifecycleException, IOException {`
`13`	`12`	`if (!webappsDirectory.exists()) {`
`14`	`13`	`boolean didCreateDirectories = webappsDirectory.mkdirs();`
`15`	`14`	`if (!didCreateDirectories) {`
`16`		`- throw new RuntimeException("Failed to create directory required by Tomcat: " + webappsDirectory.getAbsolutePath());`
	`15`	`+ throw new RuntimeException(`
	`16`	`+ "Failed to create directory required by Tomcat: " + webappsDirectory.getAbsolutePath());`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`