code cleanup

Author: hmottestad

.gitignore

@@ -54,3 +54,4 @@ e2e/test-results
 /tools/server/.lwjgl/
 .m2_repo/
 .serena/
+.vscode

tools/server-boot/src/main/java/org/eclipse/rdf4j/tools/serverboot/CssPathFilter.java

@@ -31,8 +31,8 @@
 
 /**
  * Replaces {@code ${path}} placeholders inside CSS responses after buffering the downstream output. The buffering
- * avoids calling {@link javax.servlet.ServletResponse#getWriter()} before the target resource starts writing,
- * preventing writer/output stream conflicts on binary responses.
+ * avoids calling {@link ServletResponse#getWriter()} before the target resource starts writing, preventing
+ * writer/output stream conflicts on binary responses.
  */
 class CssPathFilter implements Filter {
 

tools/server-boot/src/test/java/org/eclipse/rdf4j/server/boot/SolrAutoConfigurationTest.java

@@ -16,6 +16,7 @@
 import org.apache.solr.client.solrj.SolrClient;
 import org.eclipse.rdf4j.tools.serverboot.Rdf4jServerWorkbenchApplication;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
@@ -29,6 +30,6 @@ class SolrAutoConfigurationTest {
 	@Test
 	void solrClientBeanNotPresentByDefault() {
 		assertThatThrownBy(() -> applicationContext.getBean(SolrClient.class))
-				.isInstanceOf(org.springframework.beans.factory.NoSuchBeanDefinitionException.class);
+				.isInstanceOf(NoSuchBeanDefinitionException.class);
 	}
 }

tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java

@@ -21,8 +21,10 @@
 import java.io.InputStreamReader;
 import java.net.ServerSocket;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
@@ -91,12 +93,20 @@ void gracefullyStopsOnSigterm() throws Exception {
 	private void assertGracefulShutdown(String signalName) throws Exception {
 		Path projectRoot = Path.of("").toAbsolutePath();
 		String javaBin = Path.of(System.getProperty("java.home"), "bin", "java").toString();
-		String classpath = System.getProperty("java.class.path");
 		int serverPort = findFreePort();
 		int managementPort = findFreePort();
 
-		ProcessBuilder processBuilder = new ProcessBuilder(javaBin, "-cp", classpath,
-				Rdf4jServerWorkbenchApplication.class.getName(),
+		// Find the executable JAR
+		Path targetDir = projectRoot.resolve("target");
+		Path jarPath = Files.list(targetDir)
+				.sorted(Comparator.comparing(Path::toString))
+				.filter(p -> p.toString().endsWith(".jar"))
+				.filter(p -> !p.toString().endsWith("-sources.jar"))
+				.filter(p -> !p.toString().endsWith("-javadoc.jar"))
+				.findFirst()
+				.orElseThrow(() -> new IllegalStateException("Could not find executable JAR in " + targetDir));
+
+		ProcessBuilder processBuilder = new ProcessBuilder(javaBin, "-jar", jarPath.toString(),
 				"--server.port=" + serverPort,
 				"--management.server.port=" + managementPort);
 		processBuilder.directory(projectRoot.toFile());