fix: allow extending WebSecurityConfig

terrestris · Sep 4, 2023 · 33fd77c · 33fd77c
1 parent d7d3e61
commit 33fd77c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/shogun-config/src/main/java/de/terrestris/shogun/config/WebSecurityConfig.java b/shogun-config/src/main/java/de/terrestris/shogun/config/WebSecurityConfig.java
@@ -16,6 +16,8 @@
  */
 package de.terrestris.shogun.config;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -32,7 +34,7 @@ public interface WebSecurityConfig {
     };
 
     @Bean
-    @Order(Ordered.HIGHEST_PRECEDENCE)
+    @ConditionalOnMissingBean
     default SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         customHttpConfiguration(http);
         return http.getOrBuild();

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/JacksonConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/JacksonConfig.java
@@ -65,6 +65,7 @@ public ObjectMapper objectMapper() {
     public ObjectMapper get() {
         return objectMapper();
     }
+
     public void init(ObjectMapper objectMapper) {
         if (!initialized) {
             GeometryFactory geomFactory = new GeometryFactory(new PrecisionModel(coordinatePrecisionScale), srid);