Use released version of SLCORE

SonarSource · Mar 1, 2021 · 77a7701 · 77a7701
1 parent d431557
commit 77a7701
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/...re/src/org/sonarlint/eclipse/core/internal/preferences/SonarLintProjectConfiguration.java b/...re/src/org/sonarlint/eclipse/core/internal/preferences/SonarLintProjectConfiguration.java
@@ -30,8 +30,8 @@
 
 public class SonarLintProjectConfiguration {
 
-  private List<SonarLintProperty> extraProperties = new ArrayList<>();
-  private List<ExclusionItem> fileExclusions = new ArrayList<>();
+  private final List<SonarLintProperty> extraProperties = new ArrayList<>();
+  private final List<ExclusionItem> fileExclusions = new ArrayList<>();
   @Nullable
   private EclipseProjectBinding projectBinding;
   private boolean autoEnabled = true;
@@ -77,22 +77,6 @@ public String connectionId() {
       return connectionId;
     }
 
-    @Nullable
-    public String serverPathToIdePath(String serverPath) {
-      if (!serverPath.startsWith(sqPathPrefix())) {
-        return null;
-      }
-      int localPrefixLen = sqPathPrefix().length();
-      if (localPrefixLen > 0) {
-        localPrefixLen++;
-      }
-      String idePathPrefix = idePathPrefix();
-      if (!idePathPrefix.isEmpty()) {
-        idePathPrefix = idePathPrefix + "/";
-      }
-      return idePathPrefix + serverPath.substring(localPrefixLen);
-    }
-
     @Override
     public int hashCode() {
       final int prime = 31;

diff --git a/...ipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/SecurityHotspotsHandlerServer.java b/...ipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/SecurityHotspotsHandlerServer.java
@@ -336,7 +336,7 @@ private static Optional<ISonarLintFile> findHotspotFile(FetchedHotspot fetchedHo
 
     private static Optional<ISonarLintFile> findHotspotFile(FetchedHotspot fetchedHotspot, ISonarLintProject project) {
       Optional<ISonarLintFile> hotspotFile = SonarLintCorePlugin.getServersManager().resolveBinding(project)
-        .map(binding -> binding.getProjectBinding().serverPathToIdePath(fetchedHotspot.hotspot.filePath))
+        .flatMap(binding -> binding.getProjectBinding().serverPathToIdePath(fetchedHotspot.hotspot.filePath))
         .flatMap(project::find);
       if (hotspotFile.isPresent()) {
         return hotspotFile;

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
     <license.mailto>[email protected]</license.mailto>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <tycho.version>2.3.0-SNAPSHOT</tycho.version>
-    <sonarlint-core.version>5.2.0.28039</sonarlint-core.version>
+    <sonarlint-core.version>5.2.0.28259</sonarlint-core.version>
     <protobuf.version>3.11.4</protobuf.version>
     <jacoco.version>0.8.5</jacoco.version>
     <okhttp.version>3.14.9</okhttp.version>

diff --git a/target-platform-build/dev.target b/target-platform-build/dev.target
@@ -10,7 +10,7 @@
 <location path="${M2_REPO}/org/assertj/assertj-core/3.19.0" type="Directory"/>
 <location path="${M2_REPO}/org/sonarsource/orchestrator/sonar-orchestrator-osgi/3.34.0.2692" type="Directory"/>
 <location path="${M2_REPO}/com/eclipsesource/minimal-json/minimal-json/0.9.5" type="Directory"/>
-<location includeSource="true" path="${M2_REPO}/org/sonarsource/sonarlint/core/sonarlint-core/5.2.0.28039" type="Directory"/>
+<location includeSource="true" path="${M2_REPO}/org/sonarsource/sonarlint/core/sonarlint-core/5.2.0.28259" type="Directory"/>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>