SLOMNI-25 Use path to analyzer JAR provided through analyzer property (#241)

* SLOMNI-25 Use path to analyzer JAR provided through analyzer property

* SLOMNI-25 Load rule descriptions from the C# analyzer

* SLOMNI-25 Set output directory at another place to try to fix ITs

* SLOMNI-25 Use updated core and C# analyzers, get a few ITs back

* SLOMNI-25 Use latest C# analyzer with default rule enablement, get more ITs back

* SLOMNI-25 Use path provided by SLCORE to extract analyzer

* SLOMNI-25 Fix cycle in plugin classes

* SLOMNI-25 Use master builds of C# analyzer and SLCORE 10.10

* SLOMNI-25 Only extract analyzer ZIP from plugin JAR

Author: jblievremont

its/pom.xml

@@ -47,7 +47,25 @@
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarlint.core</groupId>
-      <artifactId>sonarlint-core</artifactId>
+      <artifactId>sonarlint-java-client-utils</artifactId>
+      <version>${sonarlint-core.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarlint.core</groupId>
+      <artifactId>sonarlint-rpc-protocol</artifactId>
+      <version>${sonarlint-core.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarlint.core</groupId>
+      <artifactId>sonarlint-rpc-impl</artifactId>
+      <version>${sonarlint-core.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarlint.core</groupId>
+      <artifactId>sonarlint-rpc-java-client</artifactId>
       <version>${sonarlint-core.version}</version>
       <scope>test</scope>
     </dependency>
@@ -145,6 +163,26 @@
                </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>download-analyzer-for-its</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.sonarsource.dotnet</groupId>
+                  <artifactId>sonar-csharp-plugin</artifactId>
+                  <version>${analyzer.version}</version>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/analyzer</outputDirectory>
+                  <!-- Use a static file name to simplify access from tests -->
+                  <destFileName>sonarcsharp.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

its/src/test/java/org/sonarsource/sonarlint/omnisharp/its/OmnisharpIntegrationTests.java

@@ -16,7 +16,6 @@
   <description>Code Analyzer based on Omnisharp</description>
 
   <properties>
-    <analyzer.version>9.32.0.97167</analyzer.version>
     <!-- The following properties should match https://github.com/SonarSource/sonar-dotnet/blob/master/pom.xml#L58 for the given analyzer version -->
     <sonar.analyzer.commons>2.12.0.2964</sonar.analyzer.commons>
     <sonar.version>10.10.0.2391</sonar.version>
@@ -170,9 +169,6 @@
           <exclude>analyzer-version.txt</exclude>
         </excludes>
       </resource>
-      <resource>
-        <directory>${sonarAnalyzer.directory}</directory>
-      </resource>
       <resource>
         <directory>${servicesDll.directory}</directory>
       </resource>
@@ -184,7 +180,7 @@
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <configuration>
           <pluginName>C# Code Quality and Security (Omnisharp)</pluginName>
-          <pluginKey>csharp</pluginKey>
+          <pluginKey>omnisharp</pluginKey>
           <pluginClass>org.sonarsource.sonarlint.omnisharp.OmnisharpPlugin</pluginClass>
           <skipDependenciesPackaging>true</skipDependenciesPackaging>
           <sonarLintSupported>true</sonarLintSupported>
@@ -225,9 +221,9 @@
         <executions>
           <execution>
             <id>download-analyzer</id>
-            <phase>generate-resources</phase>
+            <phase>generate-test-resources</phase>
             <goals>
-              <goal>unpack</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
               <artifactItems>
@@ -236,9 +232,10 @@
                   <artifactId>sonar-csharp-plugin</artifactId>
                   <version>${analyzer.version}</version>
                   <overWrite>true</overWrite>
+                  <!-- Use a static file name to simplify access from tests -->
+                  <destFileName>sonarcsharp.jar</destFileName>
                 </artifactItem>
               </artifactItems>
-              <includes>**/static/SonarAnalyzer-*.zip,**/org/sonar/plugins/csharp/*.json,**/org/sonar/plugins/csharp/*.html</includes>
               <outputDirectory>${sonarAnalyzer.directory}</outputDirectory>
             </configuration>
           </execution>
@@ -255,13 +252,13 @@
             </goals>
             <configuration>
               <outputDirectory>${servicesDll.directory}</outputDirectory>
-              <resources>          
+              <resources>
                 <resource>
                   <directory>../omnisharp-dotnet/JarContentFiles</directory>
                   <filtering>false</filtering>
                 </resource>
-              </resources>              
-            </configuration>            
+              </resources>
+            </configuration>
           </execution>
         </executions>
       </plugin>

omnisharp-plugin/pom.xml

@@ -28,13 +28,13 @@ public class CSharpLanguage extends AbstractLanguage {
   private final Configuration configuration;
 
   public CSharpLanguage(Configuration configuration) {
-    super(OmnisharpPlugin.LANGUAGE_KEY, OmnisharpPlugin.LANGUAGE_NAME);
+    super(OmnisharpPluginConstants.LANGUAGE_KEY, OmnisharpPluginConstants.LANGUAGE_NAME);
     this.configuration = configuration;
   }
 
   @Override
   public String[] getFileSuffixes() {
-    return configuration.getStringArray(OmnisharpPlugin.FILE_SUFFIXES_KEY);
+    return configuration.getStringArray(CSharpPropertyDefinitions.FILE_SUFFIXES_KEY);
   }
 
   @Override

omnisharp-plugin/src/main/java/org/sonarsource/sonarlint/omnisharp/CSharpLanguage.java

@@ -25,12 +25,15 @@
 import org.sonar.api.config.PropertyDefinition;
 import org.sonar.api.resources.Qualifiers;
 
-import static org.sonarsource.sonarlint.omnisharp.OmnisharpPlugin.LANGUAGE_KEY;
+import static org.sonarsource.sonarlint.omnisharp.OmnisharpPluginConstants.LANGUAGE_KEY;
 
 public class CSharpPropertyDefinitions {
 
   private static final String PROP_PREFIX = "sonar.";
 
+  static final String FILE_SUFFIXES_KEY = PROP_PREFIX + OmnisharpPluginConstants.LANGUAGE_KEY + ".file.suffixes";
+  static final String FILE_SUFFIXES_DEFVALUE = ".cs";
+
   public List<PropertyDefinition> create() {
     List<PropertyDefinition> result = new ArrayList<>();
     result.add(
@@ -86,13 +89,18 @@ public List<PropertyDefinition> create() {
         .build());
     result.add(
       PropertyDefinition.builder(getFileSuffixProperty())
-        .category(OmnisharpPlugin.LANGUAGE_NAME)
-        .defaultValue(OmnisharpPlugin.FILE_SUFFIXES_DEFVALUE)
+        .category(OmnisharpPluginConstants.LANGUAGE_NAME)
+        .defaultValue(FILE_SUFFIXES_DEFVALUE)
         .name("File suffixes")
         .description("Comma-separated list of suffixes of files to analyze.")
         .multiValues(true)
         .onQualifiers(Qualifiers.PROJECT)
         .build());
+    result.add(
+      PropertyDefinition.builder(getAnalyzerPath())
+        .hidden()
+        .build()
+    );
     return result;
   }
 
@@ -143,4 +151,8 @@ public static String getLoadProjectsTimeout() {
   public static String getStartupTimeout() {
     return PROP_PREFIX + LANGUAGE_KEY + ".internal.startupTimeout";
   }
+
+  public static String getAnalyzerPath() {
+    return PROP_PREFIX + LANGUAGE_KEY + ".internal.analyzerPath";
+  }
 }