From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 4 Dec 2017 14:33:35 +0000 (+0100)
Subject: Simplify usage of sonar-ws-generator
X-Git-Tag: 7.0-RC1~192
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=092655abdb8dbb58d5c30ded8f2c293abf979040;p=sonarqube.git

Simplify usage of sonar-ws-generator
---

diff --git a/sonar-ws-generator/run.sh b/sonar-ws-generator/run.sh
index 71d3af84b58..58b77a09c44 100755
--- a/sonar-ws-generator/run.sh
+++ b/sonar-ws-generator/run.sh
@@ -6,5 +6,5 @@
 set -euo pipefail
 
 mvn clean package -Prun-ws-generator
-java -Dorchestrator.configUrl=file://$* -jar target/sonar-ws-generator-*-SNAPSHOT-jar-with-dependencies.jar
+java -jar target/sonar-ws-generator-*-SNAPSHOT-jar-with-dependencies.jar
 cp -R target/generated-sources/results/org/sonarqube/ws/client/* ../sonar-ws/src/main/java/org/sonarqube/ws/client
diff --git a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
index 2d8259db71a..ca05435222b 100644
--- a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
+++ b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
@@ -22,6 +22,8 @@ package org.sonarqube.wsgenerator;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.http.HttpCall;
 import com.sonar.orchestrator.http.HttpResponse;
+import com.sonar.orchestrator.locator.FileLocation;
+import java.io.File;
 
 public class ApiDefinitionDownloader {
 
@@ -30,13 +32,9 @@ public class ApiDefinitionDownloader {
   }
 
   public static String downloadApiDefinition() {
-    String orchestratorUrl = System.getProperty("orchestrator.configUrl");
-    if (orchestratorUrl == null) {
-      throw new IllegalStateException("Please run with -Dorchestrator.configUrl=file:///path/to/your/orchestrator.properties");
-    }
     Orchestrator orchestrator = Orchestrator
       .builderEnv()
-      .setSonarVersion("DEV")
+      .setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/target"), "sonarqube-*.zip").getFile())
       .build();
 
     orchestrator.start();