Add missing easyIndexUrl argument to Maven Crawler

fasten-project · Sep 8, 2023 · e5ce949 · e5ce949
1 parent 519da30
commit e5ce949
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/plugins/maven-crawler/src/main/java/eu/f4sten/mavencrawler/MavenCrawlerArgs.java b/plugins/maven-crawler/src/main/java/eu/f4sten/mavencrawler/MavenCrawlerArgs.java
@@ -27,7 +27,6 @@ public class MavenCrawlerArgs {
     @Parameter(names = "--mc.kafkaOut")
     public String kafkaOut = DefaultTopics.INGEST;
 
-    @Parameter(names = "--mc.indexUrl")
-    public String indexUrl = "https://repo1.maven.org/maven2/.index/nexus-maven-repository-index.%d.gz";
-
+    @Parameter(names = "--mc.easyIndexUrl")
+    public String easyIndexUrl;
 }
diff --git a/plugins/maven-crawler/src/main/java/eu/f4sten/mavencrawler/MavenCrawlerInjectorConfig.java b/plugins/maven-crawler/src/main/java/eu/f4sten/mavencrawler/MavenCrawlerInjectorConfig.java
@@ -15,22 +15,32 @@
  */
 package eu.f4sten.mavencrawler;
 
-import com.google.inject.Binder;
+import com.google.inject.Provides;
 
-import dev.c0ps.diapper.IInjectorConfig;
+import dev.c0ps.diapper.AssertArgs;
 import dev.c0ps.diapper.InjectorConfig;
+import dev.c0ps.diapper.InjectorConfigBase;
+import jakarta.inject.Named;
 
 @InjectorConfig
-public class MavenCrawlerInjectorConfig implements IInjectorConfig {
+public class MavenCrawlerInjectorConfig extends InjectorConfigBase {
 
     private MavenCrawlerArgs args;
 
     public MavenCrawlerInjectorConfig(MavenCrawlerArgs args) {
         this.args = args;
     }
 
-    @Override
-    public void configure(Binder binder) {
-        binder.bind(MavenCrawlerArgs.class).toInstance(args);
+    @Provides
+    public MavenCrawlerArgs provideMavenCrawlerArgs() {
+        return args;
+    }
+
+    @Provides
+    @Named("EasyIndexClient.serverUrl")
+    public String provideEasyIndexClientServerUrl() {
+        AssertArgs.assertFor(args) //
+                .that(a -> a.easyIndexUrl != null && !a.easyIndexUrl.isEmpty(), "easyIndexUrl");
+        return args.easyIndexUrl;
     }
 }
diff --git a/plugins/pom-analyzer/src/main/java/eu/f4sten/pomanalyzer/PomAnalyzerInjectorConfig.java b/plugins/pom-analyzer/src/main/java/eu/f4sten/pomanalyzer/PomAnalyzerInjectorConfig.java
@@ -18,28 +18,27 @@
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
 
-import com.google.inject.Binder;
 import com.google.inject.Provides;
 
-import dev.c0ps.diapper.IInjectorConfig;
 import dev.c0ps.diapper.InjectorConfig;
+import dev.c0ps.diapper.InjectorConfigBase;
 import dev.c0ps.io.JsonUtils;
 import eu.f4sten.infra.utils.PostgresConnector;
 import eu.f4sten.infra.utils.Version;
 import eu.f4sten.pomanalyzer.utils.DatabaseUtils;
 
 @InjectorConfig
-public class PomAnalyzerInjectorConfig implements IInjectorConfig {
+public class PomAnalyzerInjectorConfig extends InjectorConfigBase {
 
     private PomAnalyzerArgs args;
 
     public PomAnalyzerInjectorConfig(PomAnalyzerArgs args) {
         this.args = args;
     }
 
-    @Override
-    public void configure(Binder binder) {
-        binder.bind(PomAnalyzerArgs.class).toInstance(args);
+    @Provides
+    public PomAnalyzerArgs providePomAnalyzerArgs() {
+        return args;
     }
 
     @Provides