Fixing log levels analyzer (#151)

* Fixing log levels analyzer
Updating substring comment to show on what method it should be applied
Udating hardcoded message check, so first converts the string to lowercase

* Renaming parameter from onMethod to inMethod

* Updating substring comment used to v2

src/main/java/analyzer/exercises/loglevels/LogLevelsAnalyzer.java

@@ -47,9 +47,9 @@ public void visit(MethodDeclaration node, OutputCollector output) {
             output.addComment(new AvoidHardCodedTestCases());
             return;
         }
-        
+
         if (!node.getNameAsString().equals(REFORMAT) && doesNotCallMethod(node, SUBSTRING)) {
-            output.addComment(new UseSubstringMethod());
+            output.addComment(new UseSubstringMethod(node.getNameAsString()));
             return;
         }
 
@@ -69,9 +69,10 @@ public void visit(MethodDeclaration node, OutputCollector output) {
     }
 
     private static boolean containsHarcodedString(MethodDeclaration node) {
-        List<StringLiteralExpr> hardcodedStrings = node.findAll(StringLiteralExpr.class,
-                x -> x.getValue().contains("ERROR") || x.getValue().contains("WARNING")
-                        || x.getValue().contains("INFO"));
+        List<StringLiteralExpr> hardcodedStrings = node.findAll(StringLiteralExpr.class, x -> {
+            String value = x.getValue().toLowerCase();
+            return value.contains("error") || value.contains("warning") || value.contains("info");
+        });
 
         return hardcodedStrings.size() > 1;
     }

src/main/java/analyzer/exercises/loglevels/UseSubstringMethod.java

@@ -2,14 +2,27 @@
 
 import analyzer.Comment;
 
+import java.util.Map;
+
 /**
- * @see <a href="https://github.com/exercism/website-copy/blob/main/analyzer-comments/java/log-levels/use_substring_method.md">Markdown Template</a>
+ * @see <a href="https://github.com/exercism/website-copy/blob/main/analyzer-comments/java/log-levels/use_substring_method_v2.md">Markdown Template</a>
  */
 class UseSubstringMethod extends Comment {
+    private final String inMethod;
+
+    public UseSubstringMethod(String inMethod) {
+        this.inMethod = inMethod;
+    }
 
     @Override
     public String getKey() {
-        return "java.log-levels.use_substring_method";
+        return "java.log-levels.use_substring_method_v2";
+    }
+
+    @Override
+    public Map<String, String> getParameters() {
+        return Map.of(
+                "inMethod", this.inMethod);
     }
 
     @Override

src/test/java/analyzer/AnalyzerIntegrationTest.java

@@ -133,7 +133,8 @@ void needforspeed(String scenario) throws IOException {
     @ParameterizedTest
     @ValueSource(strings = {
             "ExemplarSolution",
-            "HardCodingLogLevels",
+            "HardCodingLogLevelsUpperCase",
+            "HardCodingLogLevelsLowerCase",
             "NoReuseLogLevel",
             "NoReuseMessage",
             "NoReuseOfBothMethods",

src/test/resources/analyzer/AnalyzerIntegrationTest.loglevels.HardCodingLogLevelsUpperCase.approved.txt

@@ -0,0 +1,14 @@
+{
+  "comments": [
+    {
+      "comment": "java.general.avoid_hard_coded_test_cases",
+      "params": {},
+      "type": "essential"
+    },
+    {
+      "comment": "java.general.feedback_request",
+      "params": {},
+      "type": "informative"
+    }
+  ]
+}

src/test/resources/analyzer/AnalyzerIntegrationTest.loglevels.NotUsingSubstringOnBothMethods.approved.txt

@@ -1,8 +1,17 @@
 {
   "comments": [
     {
-      "comment": "java.log-levels.use_substring_method",
-      "params": {},
+      "comment": "java.log-levels.use_substring_method_v2",
+      "params": {
+        "inMethod": "message"
+      },
+      "type": "actionable"
+    },
+    {
+      "comment": "java.log-levels.use_substring_method_v2",
+      "params": {
+        "inMethod": "logLevel"
+      },
       "type": "actionable"
     },
     {

src/test/resources/analyzer/AnalyzerIntegrationTest.loglevels.NotUsingSubstringOnLogLevel.approved.txt

@@ -1,8 +1,10 @@
 {
   "comments": [
     {
-      "comment": "java.log-levels.use_substring_method",
-      "params": {},
+      "comment": "java.log-levels.use_substring_method_v2",
+      "params": {
+        "inMethod": "logLevel"
+      },
       "type": "actionable"
     },
     {

src/test/resources/analyzer/AnalyzerIntegrationTest.loglevels.NotUsingSubstringOnMessage.approved.txt

@@ -1,8 +1,10 @@
 {
   "comments": [
     {
-      "comment": "java.log-levels.use_substring_method",
-      "params": {},
+      "comment": "java.log-levels.use_substring_method_v2",
+      "params": {
+        "inMethod": "message"
+      },
       "type": "actionable"
     },
     {

src/test/resources/scenarios/log-levels/HardCodingLogLevelsLowerCase.java

@@ -0,0 +1,20 @@
+package scenarios.loglevels;
+
+public class LogLevels {
+    public static String message(String logLine) {
+        return logLine.substring(logLine.indexOf(":") + 1).trim();
+    }
+
+	public static String logLevel(String logLine) {
+		if (logLine.toLowerCase().contains("info"))
+			return "info";
+		if (logLine.toLowerCase().contains("warning"))
+			return "warning";
+
+		return "error";
+	}
+
+    public static String reformat(String logLine) {
+        return message(logLine) + " (" + logLevel(logLine) + ")";
+    }
+}

tests/log-levels/no-substring-used/expected_analysis.json

@@ -1,8 +1,10 @@
 {
   "comments": [
     {
-      "comment": "java.log-levels.use_substring_method",
-      "params": {},
+      "comment": "java.log-levels.use_substring_method_v2",
+      "params": {
+        "inMethod": "message"
+      },
       "type": "actionable"
     },
     {

tests/log-levels/no-substring-used/src/main/java/LogLevels.java

@@ -1,7 +1,6 @@
 class LogLevels {
     public static String message(String logLine) {
-        return logLine.split("]: ")[1]
-                .trim();
+        return logLine.split("]: ")[1].trim();
     }
 
     public static String logLevel(String logLine) {