Enable loading of relational db fixtures from multiple directories

src/main/java/org/fairdatapoint/config/BootstrapConfig.java

@@ -23,7 +23,7 @@
 package org.fairdatapoint.config;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
+import org.fairdatapoint.config.properties.BootstrapProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
@@ -33,8 +33,9 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 
 /**
  * The {@code BootstrapConfig} class configures a repository populator to load initial data into the relational
@@ -55,35 +56,31 @@
 @Slf4j
 public class BootstrapConfig {
     private final ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
-    private final boolean bootstrapEnabled;
-    private final Path dbFixturesPath;
+    private final BootstrapProperties bootstrap;
 
-    public BootstrapConfig(
-            @Value("${bootstrap.enabled:false}") boolean bootstrapEnabled,
-            @Value("${bootstrap.db-fixtures-dir}") String dbFixturesDir
-    ) {
-        this.bootstrapEnabled = bootstrapEnabled;
-        this.dbFixturesPath = Path.of(dbFixturesDir);
+    public BootstrapConfig(BootstrapProperties bootstrapProperties) {
+        this.bootstrap = bootstrapProperties;
     }
 
     @Bean
     public Jackson2RepositoryPopulatorFactoryBean repositoryPopulator() {
         final Jackson2RepositoryPopulatorFactoryBean factory = new Jackson2RepositoryPopulatorFactoryBean();
-        if (bootstrapEnabled) {
+        if (this.bootstrap.isEnabled()) {
             log.info("Bootstrap repository populator enabled");
             try {
                 // collect fixture resources
-                final Path fixturesPath = dbFixturesPath.resolve("*.json");
-                final Resource[] resources = resourceResolver.getResources("file:" + fixturesPath);
+                System.out.println(this.bootstrap.getDbFixturesDirs());
+                final List<Resource> resources = new ArrayList<>();
+                for (String fixturesDir : this.bootstrap.getDbFixturesDirs()) {
+                    final String locationPattern = "file:" + Path.of(fixturesDir).resolve("*.json");
+                    resources.addAll(List.of(resourceResolver.getResources(locationPattern)));
+                }
                 // sort resources to guarantee lexicographic order
-                Arrays.sort(
-                        resources,
-                        Comparator.comparing(
-                                Resource::getFilename,
-                                Comparator.nullsLast(String::compareTo)
-                        )
-                );
-                factory.setResources(resources);
+                resources.sort(Comparator.comparing(
+                        Resource::getFilename,
+                        Comparator.nullsLast(String::compareTo)
+                ));
+                factory.setResources(resources.toArray(new Resource[0]));
             }
             catch (IOException exception) {
                 exception.printStackTrace();

src/main/java/org/fairdatapoint/config/properties/BootstrapProperties.java

@@ -28,13 +28,16 @@
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import java.util.List;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
 @Setter
 @ConfigurationProperties(prefix = "bootstrap")
 public class BootstrapProperties {
+    // boolean defaults to false
     private boolean enabled;
     // directories relative to project root
-    private String dbFixturesDir;
+    private List<String> dbFixturesDirs;
 }

src/main/java/org/fairdatapoint/database/rdf/migration/RdfDevelopmentMigrationRunner.java

@@ -36,7 +36,7 @@
 import org.springframework.stereotype.Service;
 
 @Service
-@Profile(Profiles.NON_PRODUCTION)
+@Profile("none")
 public class RdfDevelopmentMigrationRunner {
 
     @Value("${spring.profiles.active}")

src/main/resources/application-development.yml

@@ -12,6 +12,9 @@ spring:
     username: fdp
     password: fdp
   flyway:
-    locations: classpath:dev/db/migration,classpath:db/migration
+    locations: classpath:db/migration
     fail-on-missing-locations: true
     clean-disabled: false
+
+bootstrap:
+  enabled: true

src/main/resources/application.yml

@@ -113,4 +113,5 @@ server:
   forward-headers-strategy: framework
 
 bootstrap:
-  db-fixtures-dir: "fixtures"
+  db-fixtures-dirs:
+    - "fixtures"