Merge branch 'hotfix/V3.4.1'

gquerret · gquerret · commit 704c2a83b8be · 2025-10-14T14:24:23.000+02:00
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
@@ -21,37 +21,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
   </dependencies>
 
diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
@@ -30,17 +30,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeSettings.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeSettings.java
@@ -562,15 +562,6 @@ public File getListingFile(InputFile file) {
       return rtbCompatibility ? getFileFromRtbListDir(relPath, ".l") : getFileFromPctDirs(relPath);
   }
 
-  public boolean skipUnchangedFiles() {
-    if (runtime.getProduct() != SonarProduct.SONARQUBE)
-      return false;
-    boolean developerOrMore = ((runtime.getEdition() == SonarEdition.DEVELOPER)
-        || (runtime.getEdition() == SonarEdition.ENTERPRISE) || (runtime.getEdition() == SonarEdition.DATACENTER));
-    boolean version99OrMore = runtime.getApiVersion().isGreaterThanOrEqual(Version.create(9, 9));
-    return developerOrMore && version99OrMore && config.get("sonar.pullrequest.branch").isPresent();
-  }
-
   public boolean useCache() {
     if (runtime.getProduct() != SonarProduct.SONARQUBE)
       return false;
diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCPDSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCPDSensor.java
@@ -69,7 +69,7 @@ public void execute(SensorContext context) {
       return;
     settings.init();
     IRefactorSessionEnv sessions = settings.getProparseSessions();
-    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
+    boolean skipUnchangedFiles = context.canSkipUnchangedFiles();
 
     for (InputFile file : context.fileSystem().inputFiles(
         context.fileSystem().predicates().hasLanguage(Constants.LANGUAGE_KEY))) {
diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCodeColorizer.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCodeColorizer.java
@@ -69,7 +69,7 @@ public void execute(SensorContext context) {
       return;
     settings.init();
     IRefactorSessionEnv sessions = settings.getProparseSessions();
-    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
+    boolean skipUnchangedFiles = context.canSkipUnchangedFiles();
     for (InputFile file : context.fileSystem().inputFiles(
         context.fileSystem().predicates().hasLanguage(Constants.LANGUAGE_KEY))) {
       if (skipUnchangedFiles && !components.isChanged(context, file)) {
diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java
@@ -160,7 +160,7 @@ public void execute(SensorContext context) {
 
     settings.init();
     components.init(context);
-    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
+    boolean skipUnchangedFiles = context.canSkipUnchangedFiles();
     if (skipUnchangedFiles)
       LOG.info("Unchanged files will be skipped during the analysis (SonarQube DE or more, version 9.9 or more, and sonar.pullrequest.branch is set)");
 
diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeWarningsSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeWarningsSensor.java
@@ -72,7 +72,7 @@ public void execute(SensorContext context) {
       return;
     settings.init();
 
-    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
+    boolean skipUnchangedFiles = context.canSkipUnchangedFiles();
 
     int warningsImportNum = 0;
     final RuleKey defaultWarningRuleKey = RuleKey.of(Constants.STD_REPOSITORY_KEY,
diff --git a/openedge-plugin/src/test/java/org/sonar/plugins/openedge/sensor/OpenEdgeCPDSensorTest.java b/openedge-plugin/src/test/java/org/sonar/plugins/openedge/sensor/OpenEdgeCPDSensorTest.java
@@ -29,10 +29,6 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 
-import java.util.List;
-
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.config.internal.MapSettings;
 import org.sonar.plugins.openedge.OpenEdgePluginTest;
 import org.sonar.plugins.openedge.api.Constants;
@@ -45,16 +41,15 @@ public class OpenEdgeCPDSensorTest {
 
   @Test
   public void testCPDSensor() throws Exception {
-    MapSettings settings = new MapSettings();
+    var settings = new MapSettings();
     settings.setProperty(Constants.USE_SIMPLE_CPD, true);
 
-    SensorContextTester context = TestProjectSensorContext.createContext();
+    var context = TestProjectSensorContext.createContext();
     context.setSettings(settings);
 
-    OpenEdgeSettings oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
-        OpenEdgePluginTest.SONARQUBE_RUNTIME);
-    OpenEdgeComponents components = new OpenEdgeComponents(context.config());
-    OpenEdgeCPDSensor sensor = new OpenEdgeCPDSensor(oeSettings, components);
+    var oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(), OpenEdgePluginTest.SONARQUBE_RUNTIME);
+    var components = new OpenEdgeComponents(context.config());
+    var sensor = new OpenEdgeCPDSensor(oeSettings, components);
     sensor.execute(context);
 
     assertNotNull(context.cpdTokens(BASEDIR + ":" + FILE3));
@@ -67,11 +62,10 @@ public void testCPDSensor() throws Exception {
 
   @Test
   public void testCPDSensor02() throws Exception {
-    SensorContextTester context = TestProjectSensorContext.createContext();
-    OpenEdgeSettings oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
-        OpenEdgePluginTest.SONARQUBE_RUNTIME);
-    OpenEdgeComponents components = new OpenEdgeComponents(context.config());
-    OpenEdgeCPDSensor sensor = new OpenEdgeCPDSensor(oeSettings, components);
+    var context = TestProjectSensorContext.createContext();
+    var oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(), OpenEdgePluginTest.SONARQUBE_RUNTIME);
+    var components = new OpenEdgeComponents(context.config());
+    var sensor = new OpenEdgeCPDSensor(oeSettings, components);
     sensor.execute(context);
 
     assertNull(context.cpdTokens(BASEDIR + ":" + FILE3));
@@ -81,14 +75,14 @@ public void testCPDSensor02() throws Exception {
 
   @Test
   public void testCPDSensorNoBranch() throws Exception {
-    MapSettings settings = new MapSettings();
+    var settings = new MapSettings();
     settings.setProperty(Constants.USE_SIMPLE_CPD, true);
-    SensorContextTester context = TestProjectSensorContext.createContext();
+    var context = TestProjectSensorContext.createContext();
     context.setSettings(settings);
-    OpenEdgeSettings oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
+    var oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
         OpenEdgePluginTest.SONARQUBE_DE_RUNTIME);
-    OpenEdgeComponents components = new OpenEdgeComponents(context.config());
-    OpenEdgeCPDSensor sensor = new OpenEdgeCPDSensor(oeSettings, components);
+    var components = new OpenEdgeComponents(context.config());
+    var sensor = new OpenEdgeCPDSensor(oeSettings, components);
     sensor.execute(context);
 
     assertNotNull(context.cpdTokens(BASEDIR + ":" + FILE3));
@@ -98,23 +92,23 @@ public void testCPDSensorNoBranch() throws Exception {
 
   @Test
   public void testCPDSensorBranch() throws Exception {
-    SensorContextTester context = TestProjectSensorContext.createContext();
+    var context = TestProjectSensorContext.createContext();
     context.settings().setProperty(Constants.USE_SIMPLE_CPD, true);
-    context.settings().setProperty("sonar.pullrequest.branch", "PR1");
-    OpenEdgeSettings oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
+    context.setCanSkipUnchangedFiles(true);
+    var oeSettings = new OpenEdgeSettings(context.config(), context.fileSystem(),
         OpenEdgePluginTest.SONARQUBE_DE_RUNTIME);
-    OpenEdgeComponents components = new OpenEdgeComponents(context.config());
-    OpenEdgeDependenciesSensor sensor01 = new OpenEdgeDependenciesSensor(oeSettings, components);
+    var components = new OpenEdgeComponents(context.config());
+    var sensor01 = new OpenEdgeDependenciesSensor(oeSettings, components);
     sensor01.execute(context);
-    InputFile test3 = context.fileSystem().inputFile(
+    var test3 = context.fileSystem().inputFile(
         context.fileSystem().predicates().hasRelativePath("src/procedures/test3.p"));
     assertNotNull(test3);
-    List<String> deps = components.getIncludeDependencies(test3.uri().toString());
+    var deps = components.getIncludeDependencies(test3.uri().toString());
     assertFalse(deps.isEmpty());
-    String str = deps.get(0);
+    var str = deps.get(0);
     assertEquals(str, "src\\procedures\\test3.i");
 
-    OpenEdgeCPDSensor sensor = new OpenEdgeCPDSensor(oeSettings, components);
+    var sensor = new OpenEdgeCPDSensor(oeSettings, components);
     sensor.execute(context);
 
     // No CPD tokens on unchanged files
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>3.4.0</version>
+  <version>3.4.1</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
diff --git a/profiler-parser/pom.xml b/profiler-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>
diff --git a/proparse/pom.xml b/proparse/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
diff --git a/rcode-reader/pom.xml b/rcode-reader/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
   </parent>
   <groupId>eu.rssw.openedge.rcode</groupId>
   <artifactId>rcode-reader</artifactId>
