From 99e8525729d28b423cdbb8778dfbdda1effeda64 Mon Sep 17 00:00:00 2001 From: Aleksandar Vidakovic Date: Fri, 11 Mar 2022 03:55:40 +0100 Subject: [PATCH] FINERACT-1526: Upgrade dependencies --- .github/workflows/build.yml | 2 +- README.md | 8 +++--- build.gradle | 20 +++++++------- docker-compose-community-app.yml | 27 +++++++++++++++++++ docker-compose-postgresql.yml | 11 -------- docker-compose.yml | 11 -------- fineract-provider/build.gradle | 4 +-- fineract-provider/dependencies.gradle | 1 + .../closure/api/GLClosureJsonInputParams.java | 1 + .../common/AccountingConstants.java | 6 +++++ .../accounting/common/AccountingRuleType.java | 1 + ...ancialActivityAccountsJsonInputParams.java | 1 + .../api/GLAccountJsonInputParams.java | 1 + .../glaccount/domain/GLAccountType.java | 1 + .../glaccount/domain/GLAccountUsage.java | 1 + .../api/JournalEntryJsonInputParams.java | 1 + .../journalentry/domain/JournalEntryType.java | 1 + .../api/AccountingRuleJsonInputParams.java | 1 + .../adhocquery/api/AdHocJsonInputParams.java | 1 + .../AccountNumberFormatEnumerations.java | 1 + .../domain/EntityAccountType.java | 1 + .../importhandler/ImportHandlerUtils.java | 2 +- .../data/EmailConfigurationValidator.java | 2 +- .../EmailMessageJobEmailServiceImpl.java | 2 +- .../infrastructure/codes/CodeConstants.java | 1 + .../dataqueries/data/EntityTables.java | 1 + .../domain/StorageType.java | 1 + ...neractEntityRelationRepositoryWrapper.java | 3 +-- .../organisation/office/domain/Office.java | 7 +++-- .../domain/RepaymentRescheduleType.java | 1 + .../address/domain/FieldConfiguration.java | 4 +-- .../portfolio/calendar/CalendarConstants.java | 1 + .../calendar/domain/CalendarEntityType.java | 1 + .../calendar/domain/CalendarRemindBy.java | 1 + .../calendar/domain/CalendarType.java | 1 + .../portfolio/charge/domain/Charge.java | 4 +-- ...yMemberCommandFromApiJsonDeserializer.java | 2 +- .../api/CollateralApiConstants.java | 1 + .../BusinessEventNotificationConstants.java | 1 + .../common/domain/ConditionType.java | 1 + .../portfolio/group/domain/GroupTypes.java | 1 + .../InterestIncentiveAttributeName.java | 1 + .../InterestIncentiveEntityType.java | 1 + .../incentive/InterestIncentiveType.java | 1 + .../guarantor/GuarantorConstants.java | 1 + .../guarantor/domain/GuarantorType.java | 1 + .../service/LoanScheduleAssembler.java | 2 +- ...nterestRecalculationCompoundingMethod.java | 1 + .../loanproduct/domain/LendingStrategy.java | 1 + ...PreClosureInterestCalculationStrategy.java | 1 + .../portfolio/note/domain/NoteType.java | 1 + .../portfolio/search/SearchConstants.java | 4 +++ integration-tests/dependencies.gradle | 2 ++ .../common/PaymentTypeDomain.java | 2 +- 54 files changed, 105 insertions(+), 54 deletions(-) create mode 100644 docker-compose-community-app.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69a179a27..236163f8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: services: mariad: - image: mariadb:10.6 + image: mariadb:10.8 ports: - 3306:3306 env: diff --git a/README.md b/README.md index 0208c1e81..940137cf5 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ Requirements You can run the required version of the database server in a container, instead of having to install it, like this: - docker run --name mariadb-10.6 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:10.6 + docker run --name mariadb-10.8 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:10.8 and stop and destroy it like this: - docker rm -f mariadb-10.6 + docker rm -f mariadb-10.8 Beware that this database container database keeps its state inside the container and not on the host filesystem. It is lost when you destroy (rm) this container. This is typically fine for development. See [Caveats: Where to Store Data on the database container documentation](https://hub.docker.com/_/mariadb) re. how to make it persistent instead of ephemeral. @@ -49,9 +49,11 @@ Instructions to build the JAR file ============ 1. Clone the repository or download and extract the archive file to your local directory. 2. Run `./gradlew clean bootJar` to build a modern cloud native fully self contained JAR file which will be created at `fineract-provider/build/libs` directory. -3. As we are not allowed to include a JDBC driver in the built JAR, download a JDBC driver of your choice. For example: `wget https://downloads.mariadb.com/Connectors/java/connector-java-2.7.3/mariadb-java-client-2.7.3.jar` +3. As we are not allowed to include a JDBC driver in the built JAR, download a JDBC driver of your choice. For example: `wget https://downloads.mariadb.com/Connectors/java/connector-java-2.7.5/mariadb-java-client-2.7.5.jar` 4. Start the jar and pass the directory where you have downloaded the JDBC driver as loader.path, for example: `java -Dloader.path=. -jar fineract-provider/build/libs/fineract-provider.jar` (does not require external Tomcat) +NOTE: we cannot upgrade to version 3.0.x of the MariaDB driver just yet; have to wait until 3.0.4 is out for a bug fix. + The tenants database connection details are configured [via environment variables (as with Docker container)](#instructions-to-run-using-docker-and-docker-compose), e.g. like this: export FINERACT_HIKARI_PASSWORD=verysecret diff --git a/build.gradle b/build.gradle index 4d02a1c3b..3cb41aace 100644 --- a/build.gradle +++ b/build.gradle @@ -113,6 +113,7 @@ allprojects { mavenBom 'org.springframework:spring-framework-bom:5.3.16' mavenBom 'org.springframework.boot:spring-boot-dependencies:2.6.4' mavenBom 'org.junit:junit-bom:5.8.2' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2' } dependencies { @@ -128,10 +129,10 @@ allprojects { dependency 'org.apache.commons:commons-email:1.5' dependency 'commons-io:commons-io:2.11.0' dependency 'com.github.librepdf:openpdf:1.3.27' - dependency 'org.mnode.ical4j:ical4j:3.1.3' + dependency 'org.mnode.ical4j:ical4j:3.2.1' dependency 'org.quartz-scheduler:quartz:2.3.2' - dependency 'com.amazonaws:aws-java-sdk-s3:1.12.175' - dependency 'org.ehcache:ehcache:3.9.9' + dependency 'com.amazonaws:aws-java-sdk-s3:1.12.176' + dependency 'org.ehcache:ehcache:3.10.0' dependency 'com.github.spullara.mustache.java:compiler:0.9.10' dependency 'com.jayway.jsonpath:json-path:2.7.0' dependency 'org.apache.tika:tika-core:2.3.0' @@ -139,8 +140,8 @@ allprojects { dependency 'io.swagger.core.v3:swagger-annotations:2.1.13' dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4' dependency 'jakarta.jms:jakarta.jms-api:2.0.3' - dependency 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3' - dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' + dependency 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3' // Swagger needs exactly this version + dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version dependency 'org.apache.activemq:activemq-broker:5.16.4' dependency 'org.apache.bval:org.apache.bval.bundle:2.0.5' @@ -148,7 +149,7 @@ allprojects { dependency 'org.awaitility:awaitility:4.2.0' dependency 'com.github.spotbugs:spotbugs-annotations:4.6.0' dependency 'javax.cache:cache-api:1.1.1' - dependency 'org.mock-server:mockserver-junit-jupiter:5.11.2' + dependency 'org.mock-server:mockserver-junit-jupiter:5.12.0' dependency 'org.webjars.npm:swagger-ui-dist:4.6.2' dependency 'org.webjars:webjars-locator-core:0.50' dependency 'com.icegreen:greenmail-junit5:1.6.7' @@ -184,6 +185,8 @@ allprojects { dependency "javax.annotation:javax.annotation-api:1.3.2" dependency "com.google.code.findbugs:jsr305:3.0.2" dependency "commons-codec:commons-codec:1.15" + dependency "org.bouncycastle:bcpkix-jdk15on:1.70" + dependency "org.bouncycastle:bcprov-jdk15on:1.70" dependency ('org.liquibase:liquibase-core:4.8.0') { exclude 'javax.xml.bind:jaxb-api' @@ -489,7 +492,7 @@ configure(project.fineractJavaProjects) { // Configuration for the Checkstyle plugin // https://docs.gradle.org/current/userguide/checkstyle_plugin.html dependencies { - checkstyle 'com.puppycrawl.tools:checkstyle:9.3' + checkstyle 'com.puppycrawl.tools:checkstyle:10.0' checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.41.0' } @@ -511,7 +514,7 @@ configure(project.fineractJavaProjects) { // Configuration for the errorprone plugin // https://github.com/tbroyer/gradle-errorprone-plugin dependencies { - errorprone "com.google.errorprone:error_prone_core:2.10.0" + errorprone "com.google.errorprone:error_prone_core:2.11.0" } tasks.withType(JavaCompile) { @@ -573,7 +576,6 @@ configure(project.fineractJavaProjects) { "UnsafeFinalization", "JavaTimeDefaultTimeZone", "JodaPlusMinusLong", - "MutableMethodReturnType", "SwitchDefault", "VarTypeName", "ArgumentSelectionDefectChecker", diff --git a/docker-compose-community-app.yml b/docker-compose-community-app.yml new file mode 100644 index 000000000..4f67210d2 --- /dev/null +++ b/docker-compose-community-app.yml @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +version: '3.7' +services: + # Frontend service + community-app: + image: openmf/community-app:latest + container_name: mifos-ui + restart: always + ports: + - 9090:80 diff --git a/docker-compose-postgresql.yml b/docker-compose-postgresql.yml index 27fa951f0..e4a01e773 100644 --- a/docker-compose-postgresql.yml +++ b/docker-compose-postgresql.yml @@ -94,14 +94,3 @@ services: - FINERACT_DEFAULT_TENANTDB_IDENTIFIER=default - FINERACT_DEFAULT_TENANTDB_NAME=fineract_default - FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant - - # Frontend service - community-app: - image: openmf/community-app:latest - container_name: mifos-ui - restart: always - ports: - - 9090:80 - depends_on: - fineract-server: - condition: service_healthy diff --git a/docker-compose.yml b/docker-compose.yml index a804af082..3efbb7888 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,14 +90,3 @@ services: - FINERACT_DEFAULT_TENANTDB_IDENTIFIER=default - FINERACT_DEFAULT_TENANTDB_NAME=fineract_default - FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant - - # Frontend service - community-app: - image: openmf/community-app:latest - container_name: mifos-ui - restart: always - ports: - - 9090:80 - depends_on: - fineract-server: - condition: service_healthy diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 8966251aa..9e965888e 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -66,7 +66,7 @@ resolve { logging.captureStandardOutput LogLevel.INFO outputFileName = 'fineract' outputFormat = 'YAML' - prettyPrint = 'TRUE' + prettyPrint = true classpath = sourceSets.main.runtimeClasspath outputDir = file("${buildDir}/generated/swagger-ui") openApiFile = file("config/swagger/fineract-input.yaml") @@ -153,7 +153,7 @@ configurations { driver } dependencies { - driver 'org.mariadb.jdbc:mariadb-java-client:3.0.3' + driver 'org.mariadb.jdbc:mariadb-java-client:2.7.5' driver 'org.postgresql:postgresql:42.3.3' } diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 99f46690d..daeda35c5 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -135,6 +135,7 @@ dependencies { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' exclude group: 'jakarta.activation' exclude group: 'javax.activation' + exclude group: 'org.skyscreamer' } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java index 89fad67d6..dd2bbd7cb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java @@ -35,6 +35,7 @@ public enum GLClosureJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final GLClosureJsonInputParams type : GLClosureJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java index 113e7e20b..9de490cc5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java @@ -55,6 +55,7 @@ public final class AccountingConstants { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final CashAccountsForLoan type : CashAccountsForLoan.values()) { intToEnumMap.put(type.value, type); @@ -92,6 +93,7 @@ public final class AccountingConstants { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final AccrualAccountsForLoan type : AccrualAccountsForLoan.values()) { intToEnumMap.put(type.value, type); @@ -191,6 +193,7 @@ public final class AccountingConstants { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final CashAccountsForSavings type : CashAccountsForSavings.values()) { intToEnumMap.put(type.value, type); @@ -278,6 +281,7 @@ public final class AccountingConstants { private final GLAccountType mappedGLAccountType; private static List financialActivities; + static { financialActivities = new ArrayList<>(); for (final FinancialActivity type : FinancialActivity.values()) { @@ -314,6 +318,7 @@ public final class AccountingConstants { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final FinancialActivity type : FinancialActivity.values()) { intToEnumMap.put(type.value, type); @@ -363,6 +368,7 @@ public final class AccountingConstants { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final CashAccountsForShares type : CashAccountsForShares.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java index 9af5c9b4e..5457736cf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java @@ -32,6 +32,7 @@ public enum AccountingRuleType { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final AccountingRuleType type : AccountingRuleType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java index b1021b14e..4d4033635 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java @@ -35,6 +35,7 @@ public enum FinancialActivityAccountsJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final FinancialActivityAccountsJsonInputParams type : FinancialActivityAccountsJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java index 68645fd22..33af8bfdd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java @@ -36,6 +36,7 @@ public enum GLAccountJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final GLAccountJsonInputParams type : GLAccountJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java index 45ad97731..4f86f9748 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java @@ -46,6 +46,7 @@ public enum GLAccountType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final GLAccountType type : GLAccountType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java index e478f056a..851b89d4c 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java @@ -44,6 +44,7 @@ public enum GLAccountUsage { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final GLAccountUsage type : GLAccountUsage.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java index 0d9f46762..1253fee7b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java @@ -39,6 +39,7 @@ public enum JournalEntryJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final JournalEntryJsonInputParams type : JournalEntryJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java index 5dba1ba56..cabcb4938 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java @@ -42,6 +42,7 @@ public enum JournalEntryType { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final JournalEntryType type : JournalEntryType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java index 1c564cb54..49c875ae6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java @@ -38,6 +38,7 @@ public enum AccountingRuleJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final AccountingRuleJsonInputParams type : AccountingRuleJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java index 1c3a10bd8..0f759891c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java @@ -36,6 +36,7 @@ public enum AdHocJsonInputParams { } private static final Set values = new HashSet<>(); + static { for (final AdHocJsonInputParams type : AdHocJsonInputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java index 8e1b2f50c..81374004c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java @@ -79,6 +79,7 @@ public final class AccountNumberFormatEnumerations { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final AccountNumberPrefixType type : AccountNumberPrefixType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java index 1f23c1baa..9ca8d1598 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java @@ -45,6 +45,7 @@ public enum EntityAccountType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final EntityAccountType type : EntityAccountType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java index ce3bb80e3..5e0604c06 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java @@ -326,7 +326,7 @@ public final class ImportHandlerUtils { } } } - } else if (sheetName.equals(TemplatePopulateImportConstants.PRODUCT_SHEET_NAME)) { + } else { for (Row row : sheet) { for (int i = 0; i < 2; i++) { if (name != null) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java index 75e73556e..e4b87ce73 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java @@ -51,7 +51,7 @@ public final class EmailConfigurationValidator { EmailApiConstants.SMTP_PASSWORD, EmailApiConstants.SMTP_USERNAME, EmailApiConstants.SMTP_SERVER)); @Autowired - private EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) { + public EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) { this.fromApiJsonHelper = fromApiJsonHelper; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java index c9abac45d..363e89b4f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java @@ -40,7 +40,7 @@ public final class EmailMessageJobEmailServiceImpl implements EmailMessageJobEma private final ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService; @Autowired - private EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) { + public EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) { this.externalServicesReadPlatformService = externalServicesReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java index 827cdb41f..0922416a7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java @@ -38,6 +38,7 @@ public class CodeConstants { } private static final Set values = new HashSet<>(); + static { for (final CodevalueJSONinputParams type : CodevalueJSONinputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java index 5e085d2e6..a41c632b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java @@ -39,6 +39,7 @@ public enum EntityTables { "savings_account_id"); private static final Map lookup = new HashMap(); + static { for (EntityTables d : EntityTables.values()) { lookup.put(d.getName(), d); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java index fb771bd77..ba207665a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java @@ -36,6 +36,7 @@ public enum StorageType { } private static final Map intToEnumMap = new HashMap<>(); + static { for (final StorageType type : StorageType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java index 571231089..e4d3d8a13 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java @@ -28,9 +28,8 @@ public final class FineractEntityRelationRepositoryWrapper { private final FineractEntityRelationRepository fineractEntityRelationRepository; @Autowired - private FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) { + public FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) { this.fineractEntityRelationRepository = fineractEntityRelationRepository; - } public FineractEntityRelation findOneWithNotFoundDetection(final Long id) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java index 33de8eb5b..a0b614f0d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java @@ -217,11 +217,10 @@ public class Office extends AbstractPersistableCustom implements Serializable { } public boolean hasParentOf(final Office office) { - boolean isParent = false; if (this.parent != null) { - isParent = this.parent.equals(office); + return this.parent.equals(office); } - return isParent; + return false; } public boolean doesNotHaveAnOfficeInHierarchyWithId(final Long officeId) { @@ -241,7 +240,7 @@ public class Office extends AbstractPersistableCustom implements Serializable { final boolean result = child.hasAnOfficeInHierarchyWithId(officeId); if (result) { - match = result; + match = true; break; } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java index 8a937b7bf..66620432b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java @@ -52,6 +52,7 @@ public enum RepaymentRescheduleType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final RepaymentRescheduleType entityType : RepaymentRescheduleType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java index 6028e2550..1dc7d030b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java @@ -38,12 +38,10 @@ public class FieldConfiguration extends AbstractPersistableCustom { } - private FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) { + public FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) { this.entity = entity; this.table = table; this.field = field; this.isEnabled = is_enabled; - } - } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java index 8c00de90d..edd790131 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java @@ -50,6 +50,7 @@ public final class CalendarConstants { } private static final Set values = new HashSet<>(); + static { for (final CalendarSupportedParameters param : CalendarSupportedParameters.values()) { values.add(param.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java index 0e9fd9f94..f65593dd8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java @@ -51,6 +51,7 @@ public enum CalendarEntityType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final CalendarEntityType entityType : CalendarEntityType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java index b61d7f254..6f889e8b1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java @@ -44,6 +44,7 @@ public enum CalendarRemindBy { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final CalendarRemindBy remindBy : CalendarRemindBy.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java index 09535078d..29fcbeeb8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java @@ -45,6 +45,7 @@ public enum CalendarType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final CalendarType type : CalendarType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java index ea1eda4c8..3ca6660ed 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java @@ -231,7 +231,7 @@ public class Charge extends AbstractPersistableCustom { } if (enableFreeWithdrawalCharge) { - this.enableFreeWithdrawal = enableFreeWithdrawalCharge; + this.enableFreeWithdrawal = true; this.freeWithdrawalFrequency = freeWithdrawalFrequency; this.restartFrequency = restartFrequency; this.restartFrequencyEnum = restartFrequencyEnum.getValue(); @@ -240,7 +240,7 @@ public class Charge extends AbstractPersistableCustom { if (enablePaymentType) { if (paymentType != null) { - this.enablePaymentType = enablePaymentType; + this.enablePaymentType = true; this.paymentType = paymentType; } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java index 9972b5e59..41ed98b6e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java @@ -49,7 +49,7 @@ public final class ClientFamilyMemberCommandFromApiJsonDeserializer { "professionId", "locale", "dateFormat", "familyMembers")); @Autowired - private ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) { + public ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) { this.fromApiJsonHelper = fromApiJsonHelper; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java index d3ea569ef..597791b35 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java @@ -44,6 +44,7 @@ public final class CollateralApiConstants { } private static final Set values = new HashSet<>(); + static { for (final CollateralJSONinputParams type : CollateralJSONinputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java index eb014492d..f101a56a4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java @@ -83,6 +83,7 @@ public class BusinessEventNotificationConstants { } private static final Set values = new HashSet<>(); + static { for (final BusinessEvents type : BusinessEvents.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java index edb24f43b..ea464426c 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java @@ -35,6 +35,7 @@ public enum ConditionType { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final ConditionType type : ConditionType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java index a23452415..50a55214c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java @@ -40,6 +40,7 @@ public enum GroupTypes { private static final Map intToEnumMap = new HashMap<>(); private static long minValue; private static long maxValue; + static { int i = 0; for (final GroupTypes type : GroupTypes.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java index bfa401608..b5993c319 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java @@ -35,6 +35,7 @@ public enum InterestIncentiveAttributeName { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final InterestIncentiveAttributeName type : InterestIncentiveAttributeName.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java index c002ffa3b..b5008630e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java @@ -33,6 +33,7 @@ public enum InterestIncentiveEntityType { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final InterestIncentiveEntityType type : InterestIncentiveEntityType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java index 0464889d1..f14014d4d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java @@ -33,6 +33,7 @@ public enum InterestIncentiveType { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final InterestIncentiveType type : InterestIncentiveType.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java index 7a2768599..fdb1342a3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java @@ -47,6 +47,7 @@ public final class GuarantorConstants { } private static final Set values = new HashSet<>(); + static { for (final GuarantorJSONinputParams type : GuarantorJSONinputParams.values()) { values.add(type.value); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java index a41d5c8b2..db135924c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java @@ -44,6 +44,7 @@ public enum GuarantorType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final GuarantorType type : GuarantorType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java index 205fb8471..1045aa321 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java @@ -584,7 +584,7 @@ public class LoanScheduleAssembler { if (!meetingFrequency.equals(repaymentFrequency)) { throw new MeetingFrequencyMismatchException("loanapplication.repayment.frequency", "Loan repayment frequency period must match that of meeting frequency period", repaymentFrequency); - } else if (meetingFrequency.equals(repaymentFrequency)) { + } else { // repayment frequency is same as meeting frequency repayment // interval should be same or multiple of meeting interval if (repaymentInterval % meetingInterval != 0) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java index 7fcbd3603..db6b84cdb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java @@ -42,6 +42,7 @@ public enum InterestRecalculationCompoundingMethod { private final String code; private static final Map intToEnumMap = new HashMap<>(); + static { for (final InterestRecalculationCompoundingMethod type : InterestRecalculationCompoundingMethod.values()) { intToEnumMap.put(type.value, type); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java index 3f01da31c..182da5382 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java @@ -49,6 +49,7 @@ public enum LendingStrategy { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final LendingStrategy type : LendingStrategy.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java index 5725631e8..93849708e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java @@ -36,6 +36,7 @@ public enum LoanPreClosureInterestCalculationStrategy { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final LoanPreClosureInterestCalculationStrategy type : LoanPreClosureInterestCalculationStrategy.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java index 67c94b90a..ecd8708cc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java @@ -56,6 +56,7 @@ public enum NoteType { private static final Map intToEnumMap = new HashMap<>(); private static int minValue; private static int maxValue; + static { int i = 0; for (final NoteType type : NoteType.values()) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java index f5d6a7a74..975963db7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java @@ -36,6 +36,7 @@ public class SearchConstants { } private static final Set values = new HashSet<>(); + static { for (final SearchResponseParameters param : SearchResponseParameters.values()) { values.add(param.value); @@ -67,6 +68,7 @@ public class SearchConstants { } private static final Set values = new HashSet<>(); + static { for (final SearchSupportedParameters param : SearchSupportedParameters.values()) { values.add(param.value); @@ -98,6 +100,7 @@ public class SearchConstants { } private static final Set values = new HashSet<>(); + static { for (final SearchSupportedResources param : SearchSupportedResources.values()) { values.add(param.value); @@ -129,6 +132,7 @@ public class SearchConstants { } private static final Set values = new HashSet<>(); + static { for (final SearchLoanDate param : SearchLoanDate.values()) { values.add(param.value); diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 5af2f72af..cf64cdba0 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -28,6 +28,8 @@ dependencies { 'com.google.truth:truth', 'com.google.truth.extensions:truth-java8-extension', 'org.awaitility:awaitility', + 'org.bouncycastle:bcpkix-jdk15on', + 'org.bouncycastle:bcprov-jdk15on' // 'com.google.code.gson:gson', ) testImplementation ('org.mock-server:mockserver-junit-jupiter') { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeDomain.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeDomain.java index df780c215..846914c4c 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeDomain.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeDomain.java @@ -26,7 +26,7 @@ public final class PaymentTypeDomain { private Boolean isCashPayment; private Integer position; - private PaymentTypeDomain(final Integer id, final String name, final String description, final Boolean isCashPayment, + public PaymentTypeDomain(final Integer id, final String name, final String description, final Boolean isCashPayment, final Integer position) { this.id = id; this.name = name;