@Requires(value = "XXX") is case-sensitive; lowercase config silently creates no bean

Author: FrogDevelopper

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/files/FilesImportFactory.java

@@ -4,9 +4,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
+import jakarta.inject.Singleton;
 
 /**
  * Factory handling Files import based on the {@link ImportFileProperties.Format} defined in configuration.
@@ -15,27 +15,14 @@
 @Requires(property = "consul.files")
 public class FilesImportFactory {
 
-    @Bean
-    @Requires(property = "consul.files.format", value = "JSON")
-    JsonFilesImporter jsonFilesImporter(final ImportFileProperties importFileProperties, final ObjectMapper objectMapper) {
-        final var rootPath = Paths.get(importFileProperties.getRootPath());
-        final var targetPath = rootPath.resolve(importFileProperties.getTarget());
-        return new JsonFilesImporter(rootPath, targetPath, objectMapper);
-    }
-
-    @Bean
-    @Requires(property = "consul.files.format", value = "PROPERTIES")
-    PropertiesFilesImporter propertiesFilesImporter(final ImportFileProperties importFileProperties) {
-        final var rootPath = Paths.get(importFileProperties.getRootPath());
-        final var targetPath = rootPath.resolve(importFileProperties.getTarget());
-        return new PropertiesFilesImporter(rootPath, targetPath);
-    }
-
-    @Bean
-    @Requires(property = "consul.files.format", value = "YAML")
-    YamlFilesImporter yamlFilesImporter(final ImportFileProperties importFileProperties) {
-        final var rootPath = Paths.get(importFileProperties.getRootPath());
-        final var targetPath = rootPath.resolve(importFileProperties.getTarget());
-        return new YamlFilesImporter(rootPath, targetPath);
+    @Singleton
+    FilesImporter filesImporter(final ImportFileProperties properties, final ObjectMapper objectMapper) {
+        final var rootPath = Paths.get(properties.getRootPath());
+        final var targetPath = rootPath.resolve(properties.getTarget());
+        return switch (properties.getFormat()) {
+            case JSON -> new JsonFilesImporter(rootPath, targetPath, objectMapper);
+            case PROPERTIES -> new PropertiesFilesImporter(rootPath, targetPath);
+            case YAML -> new YamlFilesImporter(rootPath, targetPath);
+        };
     }
 }

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/files/JsonFilesImporter.java

@@ -59,7 +59,7 @@ protected SequencedMap<String, Object> readFile(@NonNull final File file) throws
     @NonNull
     @Override
     protected String writeValueAsString(@NonNull final Map<String, Object> map) throws JsonProcessingException {
-        if (map == null || map.isEmpty()) {
+        if (map.isEmpty()) {
             return "";
         }
         return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(map);

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/files/YamlFilesImporter.java

@@ -52,7 +52,7 @@ protected SequencedMap<String, Object> readFile(@NonNull final File file) throws
     @NonNull
     @Override
     protected String writeValueAsString(@NonNull final Map<String, Object> map) {
-        if (map == null || map.isEmpty()) {
+        if (map.isEmpty()) {
             return "";
         }
         return yaml.get().dumpAsMap(map);

consul-populate-core/src/test/java/com/frogdevelopment/consul/populate/files/JsonFilesImporterTest.java

@@ -53,7 +53,7 @@ class JsonFilesImporterTest extends BaseFilesImporterTest {
             }""";
 
     @Inject
-    private JsonFilesImporter filesImporter;
+    private FilesImporter filesImporter;
 
     @ParameterizedTest
     @CsvSource({
@@ -82,8 +82,7 @@ void should_mergeJson() {
     }
 
     @Test
-    void should_handle_empty() throws JsonProcessingException {
-        // given
+    void should_handle_empty() throws Exception {
         // when
         final var value = filesImporter.writeValueAsString(new TreeMap<>());
 

consul-populate-core/src/test/java/com/frogdevelopment/consul/populate/files/PropertiesFilesImporterTest.java

@@ -27,7 +27,7 @@ class PropertiesFilesImporterTest extends BaseFilesImporterTest {
             very.deep.nested.field.that.will.but.not=here""";
 
     @Inject
-    private PropertiesFilesImporter filesImporter;
+    private FilesImporter filesImporter;
 
     @ParameterizedTest
     @CsvSource({

consul-populate-core/src/test/java/com/frogdevelopment/consul/populate/files/YamlFilesImporterTest.java

@@ -43,7 +43,7 @@ class YamlFilesImporterTest extends BaseFilesImporterTest {
             """;
 
     @Inject
-    private YamlFilesImporter filesImporter;
+    private FilesImporter filesImporter;
 
     @ParameterizedTest
     @CsvSource({
@@ -74,8 +74,7 @@ void should_mergeYaml() {
     }
 
     @Test
-    void should_handle_empty() {
-        // given
+    void should_handle_empty() throws Exception {
         // when
         final var value = filesImporter.writeValueAsString(new TreeMap<>());