Merge branch 'hotfix/V2.24.1'

Riverside-Software · Dec 9, 2023 · ceae6e1 · ceae6e1
2 parents c9422b8 + a26a810
commit ceae6e1
Show file tree

Hide file tree

Showing 33 changed files with 408 additions and 51 deletions.
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>2.24.0</version>
+    <version>2.24.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
@@ -24,37 +24,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.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>2.24.0</version>
+    <version>2.24.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>2.24.0</version>
+    <version>2.24.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>2.24.0</version>
+    <version>2.24.1</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
@@ -59,12 +59,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>org.testng</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>2.24.0</version>
+    <version>2.24.1</version>
   </parent>
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
@@ -64,17 +64,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.24.0</version>
+      <version>2.24.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/OpenEdgePlugin.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/OpenEdgePlugin.java
@@ -41,6 +41,7 @@
 import org.sonar.plugins.openedge.sensor.OpenEdgeDBColorizer;
 import org.sonar.plugins.openedge.sensor.OpenEdgeDBRulesSensor;
 import org.sonar.plugins.openedge.sensor.OpenEdgeDBSensor;
+import org.sonar.plugins.openedge.sensor.OpenEdgeDependenciesSensor;
 import org.sonar.plugins.openedge.sensor.OpenEdgeProparseSensor;
 import org.sonar.plugins.openedge.sensor.OpenEdgeSensor;
 import org.sonar.plugins.openedge.sensor.OpenEdgeWarningsSensor;
@@ -67,8 +68,8 @@ public void define(Context context) {
     }
 
     // Sensors
-    context.addExtensions(OpenEdgeSensor.class, OpenEdgeDBSensor.class, OpenEdgeWarningsSensor.class,
-        OpenEdgeProparseSensor.class, OpenEdgeDBRulesSensor.class);
+    context.addExtensions(OpenEdgeSensor.class, OpenEdgeDBSensor.class, OpenEdgeDependenciesSensor.class,
+        OpenEdgeWarningsSensor.class, OpenEdgeProparseSensor.class, OpenEdgeDBRulesSensor.class);
 
     // Decorators
     context.addExtensions(CommonMetricsDecorator.class, CommonDBMetricsDecorator.class);

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeComponents.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeComponents.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -35,6 +36,8 @@
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.SonarProduct;
+import org.sonar.api.batch.fs.InputFile;
+import org.sonar.api.batch.fs.InputFile.Status;
 import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.config.Configuration;
@@ -75,6 +78,7 @@ public class OpenEdgeComponents {
   private boolean initialized = false;
   private String analytics = "";
   private int ncLoc = 0;
+  private Map<String, List<String>> includeDependencies = new HashMap<>();
 
   public OpenEdgeComponents() {
     this(null, null, null, null);
@@ -179,6 +183,29 @@ public int getNcLoc() {
     return ncLoc;
   }
 
+  public void addIncludeDependency(String uri, List<String> dependencies) {
+    includeDependencies.put(uri, dependencies);
+  }
+
+  public List<String> getIncludeDependencies(String uri) {
+    return includeDependencies.getOrDefault(uri, Arrays.asList());
+  }
+
+  /**
+   * Return true if main file or one of its include files has changed
+   */
+  public boolean isChanged(SensorContext context, InputFile file) {
+    if ((file.status() == Status.ADDED) || (file.status() == Status.CHANGED))
+      return true;
+    for (String str : getIncludeDependencies(file.uri().toString())) {
+      InputFile target = context.fileSystem().inputFile(context.fileSystem().predicates().hasRelativePath(str));
+      if ((target != null) && ((target.status() == Status.ADDED) || (target.status() == Status.CHANGED)))
+        return true;
+    }
+
+    return false;
+  }
+
   public Map<ActiveRule, OpenEdgeProparseCheck> getProparseRules() {
     return Collections.unmodifiableMap(ppChecksMap);
   }

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
@@ -60,12 +60,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
+import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarProduct;
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.scanner.ScannerSide;
+import org.sonar.api.utils.Version;
 import org.sonar.plugins.openedge.api.Constants;
 import org.sonar.plugins.openedge.api.objects.DatabaseWrapper;
 import org.sonarsource.api.sonarlint.SonarLintSide;
@@ -499,6 +501,14 @@ public ITypeInfo getRCode2(String fileName) {
     return null;
   }
 
+  public Path getPctIncludeFile(InputFile file) {
+    String relPath = getRelativePathToSourceDirs(file);
+    if (Strings.isNullOrEmpty(relPath))
+      return null;
+    else
+      return getPathFromPctDirs(relPath + ".inc");
+  }
+
   public File getWarningsFile(InputFile file) {
     String relPath = getRelativePathToSourceDirs(file);
     if (Strings.isNullOrEmpty(relPath))
@@ -530,6 +540,15 @@ 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();
+  }
+
   private File getFileFromRtbListDir(String fileName, String extension) {
     Path path = Paths.get(fileName);
     int lastPeriodPos = path.getFileName().toString().lastIndexOf('.');
@@ -549,6 +568,16 @@ private File getFileFromRtbListDir(String fileName, String extension) {
     return null;
   }
 
+  private Path getPathFromPctDirs(String relPath) {
+    for (Path dir : pctDirs) {
+      Path path = dir.resolve(relPath);
+      if (java.nio.file.Files.exists(path))
+        return path;
+    }
+
+    return null;
+  }
+
   private File getFileFromPctDirs(String relPath) {
     for (Path dir : pctDirs) {
       Path path = dir.resolve(relPath);

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
@@ -41,16 +41,19 @@
 import org.sonar.plugins.openedge.api.Constants;
 import org.sonar.plugins.openedge.foundation.IRefactorSessionEnv;
 import org.sonar.plugins.openedge.foundation.InputFileUtils;
+import org.sonar.plugins.openedge.foundation.OpenEdgeComponents;
 import org.sonar.plugins.openedge.foundation.OpenEdgeSettings;
 
 public class OpenEdgeCPDSensor implements Sensor {
   private static final Logger LOG = LoggerFactory.getLogger(OpenEdgeCPDSensor.class);
 
   // IoC
   private final OpenEdgeSettings settings;
+  private final OpenEdgeComponents components;
 
-  public OpenEdgeCPDSensor(OpenEdgeSettings settings) {
+  public OpenEdgeCPDSensor(OpenEdgeSettings settings, OpenEdgeComponents components) {
     this.settings = settings;
+    this.components = components;
   }
 
   @Override
@@ -66,10 +69,16 @@ public void execute(SensorContext context) {
       return;
     settings.init();
     IRefactorSessionEnv sessions = settings.getProparseSessions();
+    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
 
     for (InputFile file : context.fileSystem().inputFiles(
         context.fileSystem().predicates().hasLanguage(Constants.LANGUAGE_KEY))) {
       LOG.debug("CPD on {}", file);
+      if (skipUnchangedFiles && !components.isChanged(context, file)) {
+        LOG.debug("Skip {} as it is unchanged in this branch", file);
+        continue;
+      }
+
       IProparseEnvironment session = sessions.getSession(file.toString());
       try {
         processFile(context, session, file);

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
@@ -31,6 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.SonarProduct;
+import org.sonar.api.batch.DependsUpon;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.TextPointer;
 import org.sonar.api.batch.sensor.Sensor;
@@ -41,16 +42,20 @@
 import org.sonar.plugins.openedge.api.Constants;
 import org.sonar.plugins.openedge.foundation.IRefactorSessionEnv;
 import org.sonar.plugins.openedge.foundation.InputFileUtils;
+import org.sonar.plugins.openedge.foundation.OpenEdgeComponents;
 import org.sonar.plugins.openedge.foundation.OpenEdgeSettings;
 
+@DependsUpon(value = {"PctDependencies"})
 public class OpenEdgeCodeColorizer implements Sensor {
   private static final Logger LOG = LoggerFactory.getLogger(OpenEdgeCodeColorizer.class);
 
   // IoC
   private final OpenEdgeSettings settings;
-
-  public OpenEdgeCodeColorizer(OpenEdgeSettings settings) {
+  private final OpenEdgeComponents components;
+
+  public OpenEdgeCodeColorizer(OpenEdgeSettings settings, OpenEdgeComponents components) {
     this.settings = settings;
+    this.components = components;
   }
 
   @Override
@@ -64,9 +69,13 @@ public void execute(SensorContext context) {
       return;
     settings.init();
     IRefactorSessionEnv sessions = settings.getProparseSessions();
-
+    boolean skipUnchangedFiles = settings.skipUnchangedFiles();
     for (InputFile file : context.fileSystem().inputFiles(
         context.fileSystem().predicates().hasLanguage(Constants.LANGUAGE_KEY))) {
+      if (skipUnchangedFiles && !components.isChanged(context, file)) {
+        LOG.debug("Skip {} as it is unchanged in this branch", file);
+        continue;
+      }
       LOG.debug("Syntax highlight on {}", file);
       IProparseEnvironment session = sessions.getSession(file.toString());
       try {