Update SonarQube API to 8.9 (#915)

* Update SonarQube API to 8.9

* Set minimum SQ version for custom rules plugin

Author: guillaume-dequenne

its/plugin/python-custom-rules-plugin/pom.xml

@@ -20,6 +20,11 @@
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-plugin-api-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.sonarsource.python</groupId>
       <artifactId>sonar-python-plugin</artifactId>
@@ -49,6 +54,7 @@
         <configuration>
           <pluginClass>org.sonar.samples.python.CustomPythonRulesPlugin</pluginClass>
           <requirePlugins>python:${project.version}</requirePlugins>
+          <sonarQubeMinVersion>${sonarQubeMinVersion}</sonarQubeMinVersion>
         </configuration>
       </plugin>
 

pom.xml

@@ -89,7 +89,7 @@
     <logback.version>1.2.3</logback.version>
     <maven.project.version>2.2.1</maven.project.version>
     <mockito.version>3.9.0</mockito.version>
-    <sonar.version>7.9</sonar.version>
+    <sonar.version>8.9.0.43852</sonar.version>
     <sonar.orchestrator.version>3.35.1.2719</sonar.orchestrator.version>
     <sonar-analyzer-commons.version>1.14.1.690</sonar-analyzer-commons.version>
     <sonarlint-core.version>4.4.0.2561</sonarlint-core.version>
@@ -207,6 +207,12 @@
         <version>${sonar.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.sonarsource.sonarqube</groupId>
+        <artifactId>sonar-plugin-api-impl</artifactId>
+        <version>${sonar.version}</version>
+        <scope>test</scope>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>

python-checks/src/main/java/org/sonar/python/checks/Expressions.java

@@ -26,7 +26,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.sonar.api.internal.google.common.annotations.VisibleForTesting;
 import org.sonar.plugins.python.api.tree.AssignmentStatement;
 import org.sonar.plugins.python.api.tree.DictionaryLiteral;
 import org.sonar.plugins.python.api.tree.Expression;
@@ -152,7 +151,7 @@ public static String unescape(StringElement stringElement) {
    *                       <code>b'\u0061' == b'\\u0061'</code>
    * @return unescaped value
    */
-  @VisibleForTesting
+  // Visible for testing
   static String unescapeString(String value, boolean isBytesLiteral) {
     if (value.indexOf('\\') == -1) {
       return value;

sonar-python-plugin/pom.xml

@@ -28,6 +28,12 @@
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-plugin-api-impl</artifactId>
+      <version>${sonar.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>python-frontend</artifactId>

sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonProfile.java

@@ -24,7 +24,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.sonar.api.internal.google.common.annotations.VisibleForTesting;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition;
 import org.sonar.api.utils.log.Logger;
@@ -53,7 +52,7 @@ public void define(Context context) {
     profile.done();
   }
 
-  @VisibleForTesting
+  // Visible for testing
   static Set<RuleKey> getSecurityRuleKeys(String className, String ruleKeysMethodName, String ruleRepoMethodName) {
     try {
 

sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonRuleRepositoryTest.java

@@ -39,7 +39,7 @@ public void createRulesTest() throws IOException {
 
     assertThat(repository).isNotNull();
     assertThat(repository.language()).isEqualTo("py");
-    assertThat(repository.name()).isEqualTo("SonarAnalyzer");
+    assertThat(repository.name()).isEqualTo("SonarQube");
 
     List<RulesDefinition.Rule> rules = repository.rules();
     assertThat(rules).isNotNull();

sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonSensorTest.java

@@ -419,9 +419,9 @@ private PythonSensor sensor(@Nullable PythonCustomRuleRepository[] customRuleRep
     when(fileLinesContextFactory.createFor(Mockito.any(InputFile.class))).thenReturn(fileLinesContext);
     CheckFactory checkFactory = new CheckFactory(activeRules);
     if(customRuleRepositories == null) {
-      return new PythonSensor(fileLinesContextFactory, checkFactory, new NoSonarFilter());
+      return new PythonSensor(fileLinesContextFactory, checkFactory, mock(NoSonarFilter.class));
     }
-    return new PythonSensor(fileLinesContextFactory, checkFactory, new NoSonarFilter(), customRuleRepositories);
+    return new PythonSensor(fileLinesContextFactory, checkFactory, mock(NoSonarFilter.class), customRuleRepositories);
   }
 
   private InputFile inputFile(String name) {