wip

Author: hmottestad

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

@@ -25,7 +25,6 @@
 import org.apache.catalina.Context;
 import org.eclipse.rdf4j.common.platform.Platform;
 import org.eclipse.rdf4j.common.platform.PlatformFactory;
-import org.eclipse.rdf4j.tools.serverboot.config.SolrAutoConfigurationDisabler;
 import org.eclipse.rdf4j.workbench.proxy.CacheFilter;
 import org.eclipse.rdf4j.workbench.proxy.CookieCacheControlFilter;
 import org.eclipse.rdf4j.workbench.proxy.RedirectFilter;
@@ -65,7 +64,6 @@ public static void main(String[] args) {
 		ensureAppDataDirAccessible();
 		SpringApplication application = new SpringApplication(Rdf4jServerWorkbenchApplication.class);
 		SignalShutdownHandler signalShutdownHandler = SignalShutdownHandler.register("INT", "TERM");
-		application.addInitializers(new SolrAutoConfigurationDisabler());
 		ConfigurableApplicationContext context = application.run(args);
 		signalShutdownHandler.attachContext(context);
 	}

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

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Eclipse RDF4J contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *******************************************************************************/
+// Some portions generated by Codex
+package org.eclipse.rdf4j.tools.serverboot.config;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
+
+class SolrAutoConfigurationDisablerTest {
+
+	@Test
+	void updateEnvironmentDoesNotThrowWhenPropertySourceAlreadyPresent() {
+		ConfigurableEnvironment environment = new StandardEnvironment();
+		environment.getPropertySources()
+				.addFirst(new MapPropertySource("rdf4jSolrAutoConfiguration",
+						Map.of("spring.autoconfigure.exclude", "com.example.ExistingAutoConfig")));
+
+		SolrAutoConfigurationDisabler disabler = new SolrAutoConfigurationDisabler();
+
+		assertThatCode(() -> disabler.postProcessEnvironment(environment, null)).doesNotThrowAnyException();
+	}
+}