Merge pull request #733 from ctasada/ctasada/fix-kotlinx-module-autoc…

…onfigure (fix) Fixed a bug loading the Kotlinx Module without `use-fqn` variable
springwolf · May 3, 2024 · 4ab6650 · 4ab6650
2 parents 562818d + 5de2d74
commit 4ab6650
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/build.gradle b/springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/build.gradle
@@ -17,8 +17,10 @@ plugins {
 }
 
 dependencies {
+    api project(":springwolf-core")
+
     implementation "org.springframework:spring-context"
-    implementation "org.springframework:spring-beans"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
 
     implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}"
     implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}"

diff --git a/...on_model_converter/configuration/KotlinxSerializationModelConverterAutoConfiguration.java b/...on_model_converter/configuration/KotlinxSerializationModelConverterAutoConfiguration.java
@@ -2,19 +2,21 @@
 package io.github.springwolf.addons.kotlinx_serialization_model_converter.configuration;
 
 import io.github.springwolf.addons.kotlinx_serialization_model_converter.converter.KotlinxSerializationModelConverter;
-import org.springframework.beans.factory.annotation.Value;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * Spring AutoConfiguration adding an {@link KotlinxSerializationModelConverter} Bean to the spring context.
  */
 @Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty(name = SpringwolfConfigConstants.SPRINGWOLF_ENABLED, havingValue = "true", matchIfMissing = true)
 public class KotlinxSerializationModelConverterAutoConfiguration {
 
     @Bean
-    public KotlinxSerializationModelConverter kotlinxSerializationTypeConverter(
-            @Value("${springwolf.use-fqn}") boolean useFqn) {
-        return new KotlinxSerializationModelConverter(useFqn);
+    public KotlinxSerializationModelConverter kotlinxSerializationTypeConverter(SpringwolfConfigProperties properties) {
+        return new KotlinxSerializationModelConverter(properties.isUseFqn());
     }
 }
diff --git a/...in/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigConstants.java b/...in/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigConstants.java
@@ -10,6 +10,8 @@ public class SpringwolfConfigConstants {
 
     public static final String SPRINGWOLF_ENABLED = SPRINGWOLF_CONFIG_PREFIX + ENABLED;
 
+    public static final String SPRINGWOLF_USE_FQN = SPRINGWOLF_CONFIG_PREFIX + ".use-fqn";
+
     public static final String ENDPOINT_ACTUATOR = ".endpoint.actuator";
 
     public static final String SPRINGWOLF_ENDPOINT_ACTUATOR_ENABLED =