From fde3d9f83e22f4c35cc0c7b68e81a67b908e8b0e Mon Sep 17 00:00:00 2001
From: percyashu <percyayukashu@gmail.com>
Date: Sat, 27 Jun 2020 18:57:55 +0100
Subject: [PATCH] FINERACT-822 Enforce NonCanonicalType check

---
 fineract-provider/build.gradle                               | 2 +-
 .../fineract/batch/command/CommandStrategyProvider.java      | 5 +++--
 .../infrastructure/security/utils/ColumnValidator.java       | 2 +-
 .../java/org/apache/fineract/common/RestAssuredFixture.java  | 2 ++
 .../src/test/java/org/apache/fineract/common/Utils.java      | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 78e134d87..871ad68cb 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -397,7 +397,6 @@ tasks.withType(JavaCompile) {
                 "ProtectedMembersInFinalClass",
                 "StaticAssignmentInConstructor",
                 "InvalidBlockTag",
-                "NonCanonicalType",
                 "InvalidInlineTag",
         )
         //TODO gradually enable these checks
@@ -456,6 +455,7 @@ tasks.withType(JavaCompile) {
                 "PublicConstructorForAbstractClass",
                 "UnescapedEntity",
                 "ModifyCollectionInEnhancedForLoop",
+                "NonCanonicalType",
                 "OperatorPrecedence",
                 "EqualsGetClass",
                 "EqualsUnsafeCast",
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
index 47877d7d1..79abc061c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.batch.command;
 
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.fineract.batch.command.internal.UnknownCommandStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ import org.springframework.stereotype.Component;
 public class CommandStrategyProvider {
 
     private final ApplicationContext applicationContext;
-    private final ConcurrentHashMap<CommandContext, String> commandStrategies = new ConcurrentHashMap<>();
+    private final Map<CommandContext, String> commandStrategies = new ConcurrentHashMap<>();
 
     /**
      * Constructs a CommandStrategyProvider with argument of ApplicationContext type. It also initialize
@@ -68,7 +69,7 @@ public class CommandStrategyProvider {
             return (CommandStrategy) this.applicationContext.getBean(this.commandStrategies.get(commandContext));
         }
 
-        for (ConcurrentHashMap.Entry<CommandContext, String> entry : this.commandStrategies.entrySet()) {
+        for (Map.Entry<CommandContext, String> entry : this.commandStrategies.entrySet()) {
             if (commandContext.matcher(entry.getKey())) {
                 return (CommandStrategy) this.applicationContext.getBean(this.commandStrategies.get(entry.getKey()));
             }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
index a5953f52b..c3236fb01 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
@@ -54,7 +54,7 @@ public class ColumnValidator {
             connection = this.jdbcTemplate.getDataSource().getConnection();
             DatabaseMetaData dbMetaData = connection.getMetaData();
             ResultSet resultSet = null;
-            for (HashMap.Entry<String, Set<String>> entry : tableColumnMap.entrySet()) {
+            for (Map.Entry<String, Set<String>> entry : tableColumnMap.entrySet()) {
                 Set<String> columns = entry.getValue();
                 resultSet = dbMetaData.getColumns(null, null, entry.getKey(), null);
                 Set<String> tableColumns = getTableColumns(resultSet);
diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
index 91662eda2..48cd3b05f 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/common/RestAssuredFixture.java
@@ -48,10 +48,12 @@ public class RestAssuredFixture {
         this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
     }
 
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public <T> T httpGet(String apiPath, String jsonAttributeToGetBack) {
         return Utils.performServerGet(this.requestSpec, this.responseSpec, getApiPath(apiPath), jsonAttributeToGetBack);
     }
 
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public <T> T httpGet(String apiPath) {
         return httpGet(apiPath, "");
     }
diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
index f1cf5c260..f0ff2cead 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
@@ -69,6 +69,7 @@ public class Utils {
         }
     }
 
+    @SuppressWarnings("TypeParameterUnusedInFormals")
     public static <T> T performServerGet(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
             final String getURL, final String jsonAttributeToGetBack) {
         final String json = given().spec(requestSpec).expect().spec(responseSpec).log().ifError().when().get(getURL).andReturn().asString();