Merge pull request #2461 from guwirth/RulesDefinitionXmlLoader

replace deprecated RulesDefinitionXmlLoader
SonarOpenCommunity · Dec 29, 2022 · 8149cac · 8149cac
2 parents aac2f79 + 70fa283
commit 8149cac
Show file tree

Hide file tree

Showing 34 changed files with 880 additions and 27 deletions.
diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSARuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangsa/CxxClangSARuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.clangsa;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidyRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidyRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.clangtidy;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/...ensors/src/main/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccRuleRepository.java b/...ensors/src/main/java/org/sonar/cxx/sensors/compiler/gcc/CxxCompilerGccRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.compiler.gcc;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/compiler/vc/CxxCompilerVcRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.compiler.vc;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/cppcheck/CxxCppCheckRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.cppcheck;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemoryRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/CxxDrMemoryRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.drmemory;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/infer/CxxInferRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.infer;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/other/CxxOtherRepository.java
@@ -23,9 +23,9 @@
 import java.nio.charset.StandardCharsets;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * Loads the external rules configuration file.

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/pclint/CxxPCLintRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.pclint;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsRuleRepository.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/rats/CxxRatsRuleRepository.java
@@ -20,8 +20,8 @@
 package org.sonar.cxx.sensors.rats;
 
 import org.sonar.api.platform.ServerFileSystem;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.cxx.sensors.utils.RulesDefinitionXml;
+import org.sonar.cxx.sensors.utils.RulesDefinitionXmlLoader;
 
 /**
  * {@inheritDoc}

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/utils/RulesDefinitionXml.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/utils/RulesDefinitionXml.java
@@ -29,7 +29,6 @@
 import org.apache.commons.io.FileUtils;
 import org.sonar.api.platform.ServerFileSystem;
 import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
@@ -77,7 +76,7 @@ public void define(Context context) {
       xmlLoader.load(repository, xmlStream, encoding);
 
       for (var userExtensionXml : getExtensions(repositoryKey, "xml")) {
-        try ( var input = java.nio.file.Files.newInputStream(userExtensionXml.toPath())) {
+        try (var input = java.nio.file.Files.newInputStream(userExtensionXml.toPath())) {
           xmlRuleLoader.load(repository, input, encoding);
         } catch (IOException | IllegalStateException e) {
           LOG.error("Cannot load Rules Definions '{}'", e.getMessage());