Merge pull request #6 from INTM-Group/t213

fix: 🐛 Fix issues #228 #233 #235 #240
green-code-initiative · Feb 2, 2024 · 6c9e7eb · 6c9e7eb
2 parents 9ed5fc0 + addbabd
commit 6c9e7eb
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 867 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deleted
 
+- Deprecated java rules EC4, EC53, EC63 and EC75
+
 ## [1.5.2] - 2024-01-23
 
 ### Changed

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
       SONAR_ES_BOOTSTRAP_CHECKS_DISABLE: 'true'
     volumes:
       - type: bind
-        source: ./target/ecocode-java-plugin-1.5.3-SNAPSHOT.jar
-        target: /opt/sonarqube/extensions/plugins/ecocode-java-plugin-1.5.3-SNAPSHOT.jar
+        source: ./target/ecocode-java-plugin-1.6.0-SNAPSHOT.jar
+        target: /opt/sonarqube/extensions/plugins/ecocode-java-plugin-1.6.0-SNAPSHOT.jar
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.ecocode</groupId>
     <artifactId>ecocode-java-plugin</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <packaging>sonar-plugin</packaging>
 
@@ -67,7 +67,7 @@
         <google.re2j>1.7</google.re2j>
 
         <!-- temporary version waiting for real automatic release in ecocode repository -->
-        <ecocode-rules-specifications.version>1.4.6</ecocode-rules-specifications.version>
+        <ecocode-rules-specifications.version>1.5.0</ecocode-rules-specifications.version>
 
     </properties>
 

diff --git a/src/main/java/fr/greencodeinitiative/java/JavaCheckRegistrar.java b/src/main/java/fr/greencodeinitiative/java/JavaCheckRegistrar.java
@@ -21,7 +21,6 @@
 import java.util.List;
 
 import fr.greencodeinitiative.java.checks.ArrayCopyCheck;
-import fr.greencodeinitiative.java.checks.AvoidConcatenateStringsInLoop;
 import fr.greencodeinitiative.java.checks.AvoidFullSQLRequest;
 import fr.greencodeinitiative.java.checks.AvoidGettingSizeCollectionInLoop;
 import fr.greencodeinitiative.java.checks.AvoidMultipleIfElseStatement;
@@ -31,14 +30,11 @@
 import fr.greencodeinitiative.java.checks.AvoidSpringRepositoryCallInLoopOrStreamCheck;
 import fr.greencodeinitiative.java.checks.AvoidStatementForDMLQueries;
 import fr.greencodeinitiative.java.checks.AvoidUsageOfStaticCollections;
-import fr.greencodeinitiative.java.checks.AvoidUsingGlobalVariablesCheck;
 import fr.greencodeinitiative.java.checks.FreeResourcesOfAutoCloseableInterface;
 import fr.greencodeinitiative.java.checks.IncrementCheck;
 import fr.greencodeinitiative.java.checks.InitializeBufferWithAppropriateSize;
 import fr.greencodeinitiative.java.checks.NoFunctionCallWhenDeclaringForLoop;
 import fr.greencodeinitiative.java.checks.OptimizeReadFileExceptions;
-import fr.greencodeinitiative.java.checks.UnnecessarilyAssignValuesToVariables;
-import fr.greencodeinitiative.java.checks.UseCorrectForLoop;
 import org.sonar.plugins.java.api.CheckRegistrar;
 import org.sonar.plugins.java.api.JavaCheck;
 import org.sonarsource.api.sonarlint.SonarLintSide;
@@ -54,7 +50,6 @@ public class JavaCheckRegistrar implements CheckRegistrar {
     private static final List<Class<? extends JavaCheck>> ANNOTATED_RULE_CLASSES = List.of(
             ArrayCopyCheck.class,
             IncrementCheck.class,
-            AvoidConcatenateStringsInLoop.class,
             AvoidUsageOfStaticCollections.class,
             AvoidGettingSizeCollectionInLoop.class,
             AvoidRegexPatternNotStatic.class,
@@ -63,11 +58,8 @@ public class JavaCheckRegistrar implements CheckRegistrar {
             AvoidSpringRepositoryCallInLoopOrStreamCheck.class,
             AvoidSQLRequestInLoop.class,
             AvoidFullSQLRequest.class,
-            UseCorrectForLoop.class,
-            UnnecessarilyAssignValuesToVariables.class,
             OptimizeReadFileExceptions.class,
             InitializeBufferWithAppropriateSize.class,
-            AvoidUsingGlobalVariablesCheck.class,
             AvoidSetConstantInBatchUpdate.class,
             FreeResourcesOfAutoCloseableInterface.class,
             AvoidMultipleIfElseStatement.class

diff --git a/src/main/java/fr/greencodeinitiative/java/checks/AvoidConcatenateStringsInLoop.java b/src/main/java/fr/greencodeinitiative/java/checks/AvoidConcatenateStringsInLoop.java
diff --git a/src/main/java/fr/greencodeinitiative/java/checks/AvoidUsingGlobalVariablesCheck.java b/src/main/java/fr/greencodeinitiative/java/checks/AvoidUsingGlobalVariablesCheck.java