diff --git a/cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java b/cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java index 9d7766a9b..5050caace 100644 --- a/cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java +++ b/cli/src/main/java/org/openjdk/skara/cli/GitJCheck.java @@ -240,6 +240,16 @@ public static int run(Repository repo, String[] args) throws IOException { } var endpoint = getOption("census", arguments); + if (endpoint == null) { + try { + var conf = JCheckConfiguration.from(repo, repo.head()); + if (conf.isPresent()) { + endpoint = conf.get().census().url().toString(); + } + } catch (IOException e) { + // pass + } + } if (endpoint == null) { endpoint = "https://openjdk.java.net/census.xml"; } diff --git a/jcheck/src/main/java/org/openjdk/skara/jcheck/CensusConfiguration.java b/jcheck/src/main/java/org/openjdk/skara/jcheck/CensusConfiguration.java index eaaa2cb95..00cdf7703 100644 --- a/jcheck/src/main/java/org/openjdk/skara/jcheck/CensusConfiguration.java +++ b/jcheck/src/main/java/org/openjdk/skara/jcheck/CensusConfiguration.java @@ -23,17 +23,20 @@ package org.openjdk.skara.jcheck; import org.openjdk.skara.ini.Section; +import java.net.URI; public class CensusConfiguration { private static final CensusConfiguration DEFAULT = - new CensusConfiguration(0, "localhost"); + new CensusConfiguration(0, "localhost", URI.create("https://openjdk.java.net/census.xml")); private final int version; private final String domain; + private final URI url; - CensusConfiguration(int version, String domain) { + CensusConfiguration(int version, String domain, URI url) { this.version = version; this.domain = domain; + this.url = url; } public int version() { @@ -44,6 +47,10 @@ public String domain() { return domain; } + public URI url() { + return url; + } + static String name() { return "census"; } @@ -55,6 +62,7 @@ static CensusConfiguration parse(Section s) { var version = s.get("version", DEFAULT.version()); var domain = s.get("domain", DEFAULT.domain()); - return new CensusConfiguration(version, domain); + var url = s.get("url", DEFAULT.url().toString()); + return new CensusConfiguration(version, domain, URI.create(url)); } }