Merge pull request #17 from green-code-initiative/ISSUE_15

[ISSUE 15] correction NullPointer in EC2

Author: dedece35

src/main/java/fr/greencodeinitiative/java/checks/AvoidMultipleIfElseStatement.java

@@ -305,7 +305,9 @@ private Integer internalGetVariableUsageOfNearestParent(Map<Integer, Map<String,
             Integer nbParentUsed = null;
             for (int i = pLevel; i >= 0 && nbParentUsed == null; i--) {
                 Map<String, Integer> variablesParentLevelMap = pDataMap.get(i);
-                nbParentUsed = variablesParentLevelMap.get(variableName);
+                if (variablesParentLevelMap != null) {
+                    nbParentUsed = variablesParentLevelMap.get(variableName);
+                }
             }
 
             return nbParentUsed;

src/test/files/AvoidMultipleIfElseStatementCompareMethod.java

@@ -0,0 +1,54 @@
+/*
+ * ecoCode - Java language - Provides rules to reduce the environmental footprint of your Java programs
+ * Copyright © 2023 Green Code Initiative (https://www.ecocode.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package fr.greencodeinitiative.java.checks;
+
+class AvoidMultipleIfElseStatementCompareMethod {
+
+    public int compare(FieldVo o1, FieldVo o2) {
+
+        if (o1.getIdBlock().equals(o2.getIdBlock())) {
+            if (o1.getIdField().equals(o2.getIdField())) {
+                return 0;
+            }
+            // First original
+            if (o1.isOriginal() && !o2.isOriginal()) {
+                return -1;
+            } else if (!o1.isOriginal() && o2.isOriginal()) {
+                return 1;
+            }
+            // First min posgafld
+            Long result = o1.getColumnPos() - o2.getColumnPos();
+            if (result != 0) {
+                return result.intValue();
+            }
+
+            // First min ordgaflc
+            result = o1.getIndex() - o2.getIndex();
+            return result.intValue();
+        }
+        // First BQRY block
+        if (o1.getIdBlock().startsWith("BQRY") && !o2.getIdBlock().startsWith("BQRY")) {
+            return -1;
+        } else if (!o1.getIdBlock().startsWith("BQRY") && o2.getIdBlock().startsWith("BQRY")) {
+            return 1;
+        }
+        // If both block don't start with BQRY, sort alpha with String.compareTo method
+        return o1.getIdBlock().compareTo(o2.getIdBlock());
+    }
+
+}

src/test/java/fr/greencodeinitiative/java/checks/AvoidMultipleIfElseStatementTest.java

@@ -49,5 +49,13 @@ void testNotBlockStatement() {
                 .verifyNoIssues();
     }
 
+    @Test
+    void testCompareMethod() {
+        CheckVerifier.newVerifier()
+                .onFile("src/test/files/AvoidMultipleIfElseStatementCompareMethod.java")
+                .withCheck(new AvoidMultipleIfElseStatement())
+                .verifyNoIssues();
+    }
+
 
 }