Extend the repository configuration syntax

Reviewed-by: ehelin

Author: rwestberg

bot/src/main/java/org/openjdk/skara/bot/BotConfiguration.java

@@ -25,12 +25,12 @@
 import org.openjdk.skara.census.Census;
 import org.openjdk.skara.host.HostedRepository;
 import org.openjdk.skara.json.JSONObject;
+import org.openjdk.skara.vcs.Branch;
 
 import java.nio.file.Path;
 import java.util.Optional;
 
 public interface BotConfiguration {
-
     /**
      * Folder that WorkItems may use to store permanent data.
      * @return
@@ -44,6 +44,14 @@ public interface BotConfiguration {
      */
     HostedRepository repository(String name);
 
+    /**
+     * Retrieves the ref name that optionally follows the configuration-specific repository name.
+     * If not configured, returns the name of the VCS default branch.
+     * @param name
+     * @return
+     */
+    String repositoryRef(String name);
+
     /**
      * Additional bot-specific configuration.
      * @return

bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java

@@ -26,7 +26,7 @@
 import org.openjdk.skara.host.*;
 import org.openjdk.skara.host.network.URIBuilder;
 import org.openjdk.skara.json.*;
-import org.openjdk.skara.vcs.Repository;
+import org.openjdk.skara.vcs.*;
 
 import java.io.*;
 import java.net.URI;
@@ -115,11 +115,39 @@ private Map<String, HostedRepository> parseRepositories(JSONObject config) throw
         return ret;
     }
 
-    private HostedRepository getRepository(String name) throws ConfigurationError {
-        if (!repositories.containsKey(name)) {
-            throw new ConfigurationError("Repository " + name + " is not defined!");
+    private static class RepositoryEntry {
+        HostedRepository repository;
+        String ref;
+    }
+
+    private RepositoryEntry parseRepositoryEntry(String entry) throws ConfigurationError {
+        var ret = new RepositoryEntry();
+        var refSeparatorIndex = entry.indexOf(':');
+        if (refSeparatorIndex >= 0) {
+            ret.ref = entry.substring(refSeparatorIndex + 1);
+            entry = entry.substring(0, refSeparatorIndex);
+        }
+        var hostSeparatorIndex = entry.indexOf('/');
+        if (hostSeparatorIndex >= 0) {
+            var hostName = entry.substring(0, hostSeparatorIndex);
+            var host = hosts.get(hostName);
+            if (!hosts.containsKey(hostName)) {
+                throw new ConfigurationError("Repository entry " + entry + " uses undefined host '" + hostName + "'");
+            }
+            var repositoryName = entry.substring(hostSeparatorIndex + 1);
+            ret.repository = host.getRepository(repositoryName);
+        } else {
+            if (!repositories.containsKey(entry)) {
+                throw new ConfigurationError("Repository " + entry + " is not defined!");
+            }
+            ret.repository = repositories.get(entry);
+        }
+
+        if (ret.ref == null) {
+            ret.ref = ret.repository.getRepositoryType() == VCS.GIT ? "master" : "default";
         }
-        return repositories.get(name);
+
+        return ret;
     }
 
     public static BotRunnerConfiguration parse(JSONObject config, Path cwd) throws ConfigurationError {
@@ -131,7 +159,6 @@ public static BotRunnerConfiguration parse(JSONObject config) throws Configurati
     }
 
     public BotConfiguration perBotConfiguration(String botName) throws ConfigurationError {
-
         if (!config.contains(botName)) {
             throw new ConfigurationError("No configuration for bot name: " + botName);
         }
@@ -152,7 +179,18 @@ public Path storageFolder() {
             @Override
             public HostedRepository repository(String name) {
                 try {
-                    return getRepository(name);
+                    var entry = parseRepositoryEntry(name);
+                    return entry.repository;
+                } catch (ConfigurationError configurationError) {
+                    throw new RuntimeException("Couldn't find repository with name: " + name, configurationError);
+                }
+            }
+
+            @Override
+            public String repositoryRef(String name) {
+                try {
+                    var entry = parseRepositoryEntry(name);
+                    return entry.ref;
                 } catch (ConfigurationError configurationError) {
                     throw new RuntimeException("Couldn't find repository with name: " + name, configurationError);
                 }

bot/src/test/java/org/openjdk/skara/bot/BotRunnerConfigurationTests.java

@@ -23,13 +23,14 @@
 package org.openjdk.skara.bot;
 
 import java.nio.file.Path;
+
 import org.junit.jupiter.api.Test;
-import org.openjdk.skara.json.JSON;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.openjdk.skara.json.*;
 
-public class BotRunnerConfigurationTests {
+import static org.junit.jupiter.api.Assertions.*;
 
+class BotRunnerConfigurationTests {
     @Test
     void storageFolder() throws ConfigurationError {
         var input = JSON.object().put("storage", JSON.object().put("path", "/x"))
@@ -39,4 +40,28 @@ void storageFolder() throws ConfigurationError {
 
         assertEquals(Path.of("/x/xbot"), botCfg.storageFolder());
     }
+
+    @Test
+    void parseHost() throws ConfigurationError {
+        var input = JSON.object()
+                        .put("xbot",
+                             JSON.object().put("repository", "test/x/y"));
+        var cfg = BotRunnerConfiguration.parse(input);
+        var botCfg = cfg.perBotConfiguration("xbot");
+
+        var error = assertThrows(RuntimeException.class, () -> botCfg.repository("test/x/y"));
+        assertEquals("Repository entry test/x/y uses undefined host 'test'", error.getCause().getMessage());
+    }
+
+    @Test
+    void parseRef() throws ConfigurationError {
+        var input = JSON.object()
+                        .put("xbot",
+                             JSON.object().put("repository", "test/x/y:z"));
+        var cfg = BotRunnerConfiguration.parse(input);
+        var botCfg = cfg.perBotConfiguration("xbot");
+
+        var error = assertThrows(RuntimeException.class, () -> botCfg.repositoryRef("test/x/y:z"));
+        assertEquals("Repository entry test/x/y uses undefined host 'test'", error.getCause().getMessage());
+    }
 }