This is an automated email from the ASF dual-hosted git repository. vorburger pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit dff6109c81ac9f71a0bebc0e6154c6dc94888d11 Author: percyashu <[email protected]> AuthorDate: Thu Jun 25 05:47:05 2020 +0100 FINERACT-822 Enforce ModifyCollectionInEnhancedForLoop check --- fineract-provider/build.gradle | 2 +- .../service/EmailCampaignWritePlatformCommandHandlerImpl.java | 7 +++++-- .../sms/service/SmsCampaignWritePlatformServiceJpaImpl.java | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 1ea6b72..1723001 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -394,7 +394,6 @@ tasks.withType(JavaCompile) { "ProtectedMembersInFinalClass", "StaticAssignmentInConstructor", "InvalidBlockTag", - "ModifyCollectionInEnhancedForLoop", "NonCanonicalType", "InvalidInlineTag", ) @@ -453,6 +452,7 @@ tasks.withType(JavaCompile) { "UndefinedEquals", "PublicConstructorForAbstractClass", "UnescapedEntity", + "ModifyCollectionInEnhancedForLoop", "OperatorPrecedence", "EqualsGetClass", "EqualsUnsafeCast", diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java index 4165aae..e5848c2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java @@ -32,6 +32,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -444,8 +445,10 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai final String response = this.genericDataService.generateJsonFromGenericResultsetData(results); resultList = new ObjectMapper().readValue(response, new TypeReference<List<HashMap<String, Object>>>() {}); // loop changes array date to string date - for (HashMap<String, Object> entry : resultList) { - for (Map.Entry<String, Object> map : entry.entrySet()) { + for (Iterator<HashMap<String, Object>> it = resultList.iterator(); it.hasNext();) { + HashMap<String, Object> entry = it.next(); + for (Iterator<Map.Entry<String, Object>> iter = entry.entrySet().iterator(); iter.hasNext();) { + Map.Entry<String, Object> map = iter.next(); String key = map.getKey(); Object ob = map.getValue(); if (ob instanceof ArrayList && ((ArrayList) ob).size() == 3) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java index b243e6c..c215ce7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -543,8 +544,10 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP return resultList; } // loop changes array date to string date - for (HashMap<String, Object> entry : resultList) { - for (Map.Entry<String, Object> map : entry.entrySet()) { + for (Iterator<HashMap<String, Object>> iter = resultList.iterator(); iter.hasNext();) { + HashMap<String, Object> entry = iter.next(); + for (Iterator<Map.Entry<String, Object>> it = entry.entrySet().iterator(); it.hasNext();) { + Map.Entry<String, Object> map = it.next(); String key = map.getKey(); Object ob = map.getValue(); if (ob instanceof ArrayList && ((ArrayList) ob).size() == 3) {
