diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java index a087235cc..9401d7377 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java @@ -27,7 +27,7 @@ import io.restassured.specification.RequestSpecification; import io.restassured.specification.ResponseSpecification; import java.util.ArrayList; import java.util.HashMap; -import java.util.Map.Entry; +import java.util.Map; import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.CommonConstants; import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper; @@ -85,7 +85,7 @@ public class FlexibleSavingsInterestPostingIntegrationTest { HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId); ArrayList> transactions = (ArrayList>) accountDetails.get("transactions"); HashMap interestPostingTransaction = transactions.get(transactions.size() - 2); - for (Entry entry : interestPostingTransaction.entrySet()) { + for (Map.Entry entry : interestPostingTransaction.entrySet()) { LOG.info("{} - {}", entry.getKey(), entry.getValue().toString()); } // 1st Dec 13 to 31st March 14 - 365 days, daily compounding using daily diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java index 321c4e07a..3c1d9c1cc 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java @@ -28,7 +28,7 @@ public class CenterDomain implements Comparable { private static final Logger LOG = LoggerFactory.getLogger(CenterDomain.class); - public final static class Builder { + public static final class Builder { private final Integer id; private final String accountNo; diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrencyDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrencyDomain.java index a62994e45..fc6cfaf81 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrencyDomain.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrencyDomain.java @@ -22,7 +22,7 @@ import com.google.gson.Gson; public class CurrencyDomain implements Comparable { - public final static class Builder { + public static final class Builder { private String code; private String name; diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeDomain.java index a522b4685..28a581ca8 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeDomain.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeDomain.java @@ -23,7 +23,7 @@ import java.util.Arrays; public class OfficeDomain { - public final static class Builder { + public static final class Builder { private int id; private String name; diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsHelper.java index 604b0888b..15af82ca4 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsHelper.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsHelper.java @@ -22,7 +22,7 @@ import com.google.gson.Gson; public class FundsHelper { - final public static class Builder { + public static final class Builder { private String name; private String externalId; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java index 0556ddadf..6f9079ec7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.fineract.accounting.closure.domain.GLClosure; import org.apache.fineract.accounting.common.AccountingConstants.AccrualAccountsForLoan; import org.apache.fineract.accounting.common.AccountingConstants.CashAccountsForLoan; @@ -284,7 +283,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess } } - for (Entry entry : accountMap.entrySet()) { + for (Map.Entry entry : accountMap.entrySet()) { this.helper.createCreditJournalEntryOrReversalForLoan(office, currencyCode, loanId, transactionId, transactionDate, entry.getValue(), isReversal, entry.getKey()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java index d8a8bb493..5ee2dc361 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java @@ -35,7 +35,7 @@ public final class CommandContext { * * @author Rishabh Shukla */ - public final static class Builder { + public static final class Builder { private String resource; private String method; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java index 89714eea4..ecd58b3f2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java @@ -26,7 +26,7 @@ import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.ReadContext; import java.util.ArrayList; import java.util.List; -import java.util.Map.Entry; +import java.util.Map; import org.apache.fineract.batch.domain.BatchRequest; import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; @@ -145,7 +145,7 @@ public class ResolutionHelper { // Iterate through each element in the requestBody to find dependent // parameter - for (Entry element : jsonRequestBody.entrySet()) { + for (Map.Entry element : jsonRequestBody.entrySet()) { final String key = element.getKey(); final JsonElement value = resolveDependentVariables(element, responseCtx); jsonResultBody.add(key, value); @@ -179,7 +179,7 @@ public class ResolutionHelper { return br; } - private JsonElement resolveDependentVariables(final Entry entryElement, final ReadContext responseCtx) { + private JsonElement resolveDependentVariables(final Map.Entry entryElement, final ReadContext responseCtx) { JsonElement value = null; final JsonElement element = entryElement.getValue(); @@ -198,7 +198,7 @@ public class ResolutionHelper { private JsonElement processJsonObject(final JsonObject jsObject, final ReadContext responseCtx) { JsonObject valueObj = new JsonObject(); - for (Entry element : jsObject.entrySet()) { + for (Map.Entry element : jsObject.entrySet()) { final String key = element.getKey(); final JsonElement value = resolveDependentVariable(element.getValue(), responseCtx); valueObj.add(key, value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java index da50c25df..26d66c219 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java @@ -32,7 +32,6 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.infrastructure.core.exception.InvalidJsonException; @@ -103,10 +102,10 @@ public class FromJsonHelper { throw new InvalidParameterException(); } - final Set> entries = object.entrySet(); + final Set> entries = object.entrySet(); final List unsupportedParameterList = new ArrayList<>(); - for (final Entry providedParameter : entries) { + for (final Map.Entry providedParameter : entries) { if (!supportedParams.contains(providedParameter.getKey())) { unsupportedParameterList.add(providedParameter.getKey()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/data/EventResultSetExtractor.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/data/EventResultSetExtractor.java index 365498373..95d5a7305 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/data/EventResultSetExtractor.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/data/EventResultSetExtractor.java @@ -26,7 +26,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.ResultSetExtractor; @@ -63,11 +62,11 @@ public class EventResultSetExtractor implements ResultSetExtractor>> groupingEntry : groupToEntityMapping.entrySet()) { + for (final Map.Entry>> groupingEntry : groupToEntityMapping.entrySet()) { final List entities = new ArrayList<>(); final Grouping group = new Grouping(); group.setName(groupingEntry.getKey()); - for (final Entry> entityEntry : groupingEntry.getValue().entrySet()) { + for (final Map.Entry> entityEntry : groupingEntry.getValue().entrySet()) { final List actions = new ArrayList<>(); final Entity entity = new Entity(); entity.setName(entityEntry.getKey()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java index e8869fc18..ddeb49389 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookWritePlatformServiceJpaRepositoryImpl.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.persistence.PersistenceException; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -223,7 +222,7 @@ public class HookWritePlatformServiceJpaRepositoryImpl implements HookWritePlatf final Set configuration = new HashSet<>(); final Set fields = template.getSchema(); - for (final Entry configEntry : hookConfig.entrySet()) { + for (final Map.Entry configEntry : hookConfig.entrySet()) { for (final Schema field : fields) { final String fieldName = field.getFieldName(); if (fieldName.equalsIgnoreCase(configEntry.getKey())) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java index bb33e31f5..42d6e430d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.annotation.PostConstruct; @@ -194,7 +193,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob if (!smsDataMap.isEmpty()) { List toSaveMessages = new ArrayList<>(); List toSendNotificationMessages = new ArrayList<>(); - for (Entry> entry : smsDataMap.entrySet()) { + for (Map.Entry> entry : smsDataMap.entrySet()) { Iterator smsMessageIterator = entry.getValue().iterator(); Collection apiQueueResourceDatas = new ArrayList<>(); StringBuilder request = new StringBuilder(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLBuilder.java index 3fd282ed9..fd58bae44 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLBuilder.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLBuilder.java @@ -25,7 +25,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.fineract.mix.data.ContextData; import org.apache.fineract.mix.data.MixTaxonomyData; import org.apache.fineract.mix.data.NamespaceData; @@ -72,7 +71,7 @@ public class XBRLBuilder { this.startDate = startDate; this.endDate = endDate; - for (final Entry entry : map.entrySet()) { + for (final Map.Entry entry : map.entrySet()) { final MixTaxonomyData taxonomy = entry.getKey(); final BigDecimal value = entry.getValue(); addTaxonomy(this.root, taxonomy, value); @@ -175,7 +174,7 @@ public class XBRLBuilder { public void addContexts() { final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - for (final Entry entry : this.contextMap.entrySet()) { + for (final Map.Entry entry : this.contextMap.entrySet()) { final ContextData context = entry.getKey(); final Element contextElement = this.root.addElement("context"); contextElement.addAttribute("id", entry.getValue()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java index c77bb4cbf..b75645410 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java @@ -23,7 +23,7 @@ import java.math.BigDecimal; import java.sql.Date; import java.util.ArrayList; import java.util.HashMap; -import java.util.Map.Entry; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.script.ScriptEngine; @@ -87,7 +87,7 @@ public class XBRLResultServiceImpl implements XBRLResultService { // final HashMap resultMap = new HashMap<>(); setupBalanceMap(getAccountSql(startDate, endDate)); - for (final Entry entry : configMap.entrySet()) { + for (final Map.Entry entry : configMap.entrySet()) { final BigDecimal value = processMappingString(entry.getValue()); if (value != null) { final MixTaxonomyData taxonomy = this.readTaxonomyService.retrieveOne(Long.parseLong(entry.getKey())); diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java index b807827a9..e7733e658 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java @@ -37,7 +37,6 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import org.apache.fineract.template.domain.Template; import org.apache.fineract.template.domain.TemplateFunctions; import org.codehaus.jackson.map.ObjectMapper; @@ -179,7 +178,7 @@ public class TemplateMergeService { Map valueAsMap = (Map) value; // Map newValue = null; Map valueAsMap_second = new HashMap<>(); - for (Entry valueAsMapEntry : valueAsMap.entrySet()) { + for (Map.Entry valueAsMapEntry : valueAsMap.entrySet()) { Object valueAsMapEntryValue = valueAsMapEntry.getValue(); if (valueAsMapEntryValue instanceof Map) { // JSON Object expandMapArrays(valueAsMapEntryValue); diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java index b631a0a63..88f86f2f3 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classdupes/ClasspathHellDuplicatesChecker.java @@ -24,7 +24,6 @@ import io.github.classgraph.ScanResult; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.stream.Collectors; /** @@ -48,7 +47,7 @@ public class ClasspathHellDuplicatesChecker { public String toString(Map> map) { StringBuilder sb = new StringBuilder(); - for (Entry> entry : map.entrySet()) { + for (Map.Entry> entry : map.entrySet()) { sb.append(entry.getKey()); sb.append('\n'); for (String location : entry.getValue()) { @@ -66,7 +65,7 @@ public class ClasspathHellDuplicatesChecker { // We intentionally do not use .classFilesOnly(), or // .nonClassFilesOnly(), to check both try (ScanResult scanResult = new ClassGraph().scan()) { - for (Entry dupe : scanResult.getAllResources().findDuplicatePaths()) { + for (Map.Entry dupe : scanResult.getAllResources().findDuplicatePaths()) { String resourceName = dupe.getKey(); if (!isHarmlessDuplicate(resourceName)) { boolean addIt = true;