Add fallbackRepositories to the Json configuration

AlessioDP · Apr 16, 2024 · 817e044 · 817e044
1 parent b5451ef
commit 817e044
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/core/src/main/java/com/alessiodp/libby/configuration/ConfigurationFetcher.java b/core/src/main/java/com/alessiodp/libby/configuration/ConfigurationFetcher.java
@@ -160,7 +160,7 @@ public Configuration readJsonFile(@NotNull InputStream data) {
             }
 
             Integer version = fetchVersion(root);
-            Set<String> repositories = fetchRepositories(root);
+            Set<String> repositories = fetchRepositories(root, false);
             Set<Relocation> globalRelocations = fetchRelocations(root);
             List<Library> libraries = fetchLibraries(root, globalRelocations);
 
@@ -197,11 +197,12 @@ private Integer fetchVersion(@NotNull Map<String, Object> configuration) {
      * If defined, it must be an array of string representing the repository URLs.
      *
      * @param configuration the root object of the JSON file
+     * @param fallbackRepo {@code true} to fetch "fallbackRepositories" instead of "repositories"
      * @return the set of repositories as strings
      */
-    private Set<String> fetchRepositories(@NotNull Map<String, Object> configuration) throws ReflectiveOperationException {
+    private Set<String> fetchRepositories(@NotNull Map<String, Object> configuration, boolean fallbackRepo) throws ReflectiveOperationException {
         Set<String> repos = new HashSet<>();
-        ArrayList<Object> repositories = getArray(configuration, "repositories");
+        ArrayList<Object> repositories = getArray(configuration, fallbackRepo ? "fallbackRepositories" : "repositories");
         if (repositories != null) {
             for (Object repository : repositories) {
                 if (repository instanceof String) {
@@ -423,7 +424,9 @@ private List<Library> fetchLibraries(@NotNull Map<String, Object> configuration,
 
                 fetchExcludedTransitiveDependencies(library).forEach(libraryBuilder::excludeTransitiveDependency);
 
-                fetchRepositories(library).forEach(libraryBuilder::repository);
+                fetchRepositories(library, false).forEach(libraryBuilder::repository);
+
+                fetchRepositories(library, true).forEach(libraryBuilder::fallbackRepository);
 
                 Set<Relocation> relocations = fetchRelocations(library);
 

diff --git a/core/src/test/java/com/alessiodp/libby/ConfigurationFetcherTest.java b/core/src/test/java/com/alessiodp/libby/ConfigurationFetcherTest.java
@@ -77,6 +77,10 @@ && compareCollections(
                         "libraryRepo1/", // Add a '/' at the end since it is added by the Library builder
                         "libraryRepo2/"
                    )
+                && compareCollections(
+                        l.getFallbackRepositories(),
+                        "fallbackRepo/" // Add a '/' at the end since it is added by the Library builder
+                )
                 && compareCollections(
                         l.getRelocations(),
                         globalRelocation // Global

diff --git a/core/src/test/resources/libby.json b/core/src/test/resources/libby.json
@@ -21,6 +21,9 @@
       "repositories": [
         "libraryRepo1",
         "libraryRepo2"
+      ],
+      "fallbackRepositories": [
+        "fallbackRepo"
       ]
     },
     {