Merge branch 'apache:develop' into FINERACT-1152-fix-loan-reschedule-end-date-validation

Author: San-43

CONTRIBUTING.md

@@ -26,6 +26,48 @@ Here's how to run the set of relatively fast and independent Fineract tests:
 This runs nearly 1,000 tests and completes in a few minutes on decent hardware.
 They shouldn't need any special servers/services running.
 
+#### Cucumber E2E tests
+
+The Cucumber E2E tests run against a live Fineract instance instead of starting one for you.
+Before running them locally, create the required databases and start Fineract:
+
+```bash
+# Create required databases
+./gradlew createPGDB -PdbName=fineract_tenants
+./gradlew createPGDB -PdbName=fineract_default
+
+# Start Fineract in another terminal
+./gradlew bootRun -Dspring.profiles.active=test
+```
+
+The default E2E test connection settings live in `fineract-e2e-tests-core/src/test/resources/fineract-test-application.properties`.
+By default, the test suite connects to `https://localhost:8443`.
+
+Many E2E tests require seeded test data.
+That setup is controlled by the `INITIALIZATION_ENABLED` environment variable, which maps to `fineract-test.initialization.enabled`.
+For a fresh database, run the suite from `fineract-e2e-tests-runner` with initialization enabled first:
+
+```bash
+cd fineract-e2e-tests-runner
+INITIALIZATION_ENABLED=true ../gradlew cucumber
+```
+
+After the initialization data already exists, you can run all E2E tests without it:
+
+```bash
+cd fineract-e2e-tests-runner
+../gradlew cucumber
+```
+
+To run a single feature file:
+
+```bash
+cd fineract-e2e-tests-runner
+../gradlew cucumber -Pcucumber.features="src/test/resources/features/Loan.feature"
+```
+
+See [Cucumber E2E Tests](https://fineract.apache.org/docs/current/#testing-cucumber) for more details and additional options.
+
 #### Integration tests
 
 Running tests with external dependencies is a multi-step process with many moving parts.

LICENSE_RELEASE

@@ -208,17 +208,18 @@
 ======================================
 
 All the source code for the Apache Fineract project is released under the
-license above. Additionally, the Apache Fineract source and binary
-distribution includes a number of third-party files that are required in
-order to the software to function. Unless noted below, these jars
-and resource files are also released under the ASF license above.
+license above. Additionally, the Apache Fineract source and binary distribution
+includes a number of third-party files that are required in order to the
+software to function. Unless noted below, these jars and resource files are
+also released under the Apache License, Version 2.0.
 
 ==================================================
 *The exceptions for binary release are as follows:
 ==================================================
 
-This product bundles third party jars and resource files that are 
-released under other licenses than the ASF license. You can find
-details of all third party licenses in the directory "licenses". 
+This product bundles third party jars and resource files that are released
+under licenses other than the Apache License, Version 2.0 following the ASF 3rd
+party license policy. You can find details of all third party licenses in the
+"licenses" directory (if the "generateLicenseReport" Gradle task has been run).
 
 ******************************************

LICENSE_SOURCE

@@ -208,10 +208,10 @@
 ======================================
 
 All the source code for the Apache Fineract project is released under the
-license above. Additionally, the Apache Fineract source and binary
-distribution includes a number of third-party files that are required in
-order to the software to function. Unless noted below, these jars
-and resource files are also released under the ASF license above.
+license above. Additionally, the Apache Fineract source and binary distribution
+includes a number of third-party files that are required in order to the
+software to function. Unless noted below, these jars and resource files are
+also released under the Apache License, Version 2.0.
 
 ==================================================
 *The exceptions for source release are as follows:

README.md

@@ -1,7 +1,7 @@
 # Apache Fineract
 
 <!-- TODO Reactivate when there is a working CI-CD instance: [![Swagger Validation](https://validator.swagger.io/validator?url=https://sandbox.mifos.community/fineract-provider/swagger-ui/fineract.yaml)](https://validator.swagger.io/validator/debug?url=https://sandbox.mifos.community/fineract-provider/swagger-ui/fineract.yaml) -->
-[![Build](https://github.com/apache/fineract/actions/workflows/build-mariadb.yml/badge.svg?branch=develop)](https://github.com/apache/fineract/actions/workflows/build-mariadb.yml)
+[![Build](https://github.com/apache/fineract/actions/workflows/build-postgresql.yml/badge.svg?branch=develop)](https://github.com/apache/fineract/actions/workflows/build-postgresql.yml)
 [![Docker Hub](https://img.shields.io/docker/pulls/apache/fineract.svg?logo=Docker)](https://hub.docker.com/r/apache/fineract)
 [![Docker Build](https://github.com/apache/fineract/actions/workflows/publish-dockerhub.yml/badge.svg)](https://github.com/apache/fineract/actions/workflows/publish-dockerhub.yml)
 [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=apache_fineract&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=apache_fineract)
@@ -29,11 +29,11 @@ In the moment you get started writing code, please consult our [CONTRIBUTING](CO
 
 REQUIREMENTS
 ============
-* min. 16GB RAM and 8 core CPU
-* `MariaDB >= 12.2` or `PostgreSQL >= 18.0`
-* `Java >= 21` (Azul Zulu JVM is tested by our CI on GitHub Actions)
+* 16GB RAM and 8 core CPU (minimum hardware for running Fineract -- development and testing may require more)
+* PostgreSQL >= 18.0 ([support for other backend databases is deprecated](https://cwiki.apache.org/confluence/display/FINERACT/FSIP-9%3A+Standardize+on+PostgreSQL))
+* Java >= 21 (Azul Zulu JVM is tested by our CI on GitHub Actions)
 
-Tomcat (min. v10) is only required, if you wish to deploy the Fineract WAR to a separate external servlet container.  You do not need to install Tomcat to run Fineract. We recommend the use of the self-contained JAR, which transparently embeds a servlet container using Spring Boot.
+Tomcat (min. v10) is only needed if you wish to deploy the Fineract WAR to a separate external servlet container. You do not need to install Tomcat to run Fineract. We recommend the use of the self-contained JAR, which transparently embeds a servlet container using Spring Boot.
 
 
 SECURITY
@@ -48,72 +48,73 @@ For details about security during development and deployment, see the documentat
 INSTRUCTIONS
 ============
 
-The following how-to's assume you have Java installed, you cloned the repository (or downloaded and extracted a [specific version](https://github.com/apache/fineract/releases)) and you have a [database server](#database-and-tables) (MariaDB or PostgreSQL) running.
-
 Quick Start
 ---
 
-This section provides a simplified overview of the setup process. More detailed instructions are available below.
-
-Follow these steps to quickly set up and run Apache Fineract locally:
+Follow these steps to quickly set up and run Apache Fineract locally.
 
 ### Prerequisites
-- Java 21 or higher
-- PostgreSQL or MariaDB running locally
 
-### Clone the repository
+- Java 21 or higher (Azul Zulu is recommended)
+- PostgreSQL running locally, listening on port 5432 with proper permissions (see [below](#database-and-tables) for how to run PostgreSQL in Docker)
+
 ```bash
+# get code
 git clone https://github.com/apache/fineract.git
 cd fineract
-```
 
-### Create databases
-```bash
-./gradlew createDB -PdbName=fineract_tenants
-./gradlew createDB -PdbName=fineract_default
-```
+# create dbs
+./gradlew createPGDB -PdbName=fineract_tenants
+./gradlew createPGDB -PdbName=fineract_default
 
-### Run the application
-```bash
+# local dev/test env settings
+export FINERACT_DEFAULT_TENANTDB_PORT=5432
+export FINERACT_HIKARI_DRIVER_SOURCE_CLASS_NAME=org.postgresql.Driver
+export FINERACT_HIKARI_JDBC_URL=jdbc:postgresql://localhost:$FINERACT_DEFAULT_TENANTDB_PORT/fineract_tenants
+export POSTGRES_PASSWORD=postgres
+export FINERACT_HIKARI_PASSWORD=$POSTGRES_PASSWORD
+export FINERACT_DEFAULT_TENANTDB_PWD=$POSTGRES_PASSWORD
+
+# start backend
 ./gradlew devRun
 ```
 
+After a minute or two, Fineract will be listening for API requests on port 8443 (by default).
+
 ### Verify the application is running
-```bash
-curl --insecure https://localhost:8443/fineract-provider/actuator/health
-```
 
-How to run for local development
----
+Confirm Fineract is ready with, for example:
 
-Run the following commands in this order:
 ```bash
-./gradlew createDB -PdbName=fineract_tenants
-./gradlew createDB -PdbName=fineract_default
-./gradlew devRun
+curl --insecure https://localhost:8443/fineract-provider/actuator/health
 ```
 
-This creates two databases and builds and runs Fineract, which will be listening for API requests on port 8443 (by default) now.
-
-Confirm Fineract is ready with, for example:
+Expected response for fresh instance:
 
-```bash
-curl --insecure https://localhost:8443/fineract-provider/actuator/health
+```json
+{"status":"UP","groups":["liveness","readiness"]}
 ```
 
 To test authenticated endpoints, include credentials in your request:
 
 ```bash
-curl --location \
+# basic auth header uses colon-delimited and base64-encoded default "mifos:password" login
+curl --location --insecure \
   https://localhost:8443/fineract-provider/api/v1/clients \
   --header 'Content-Type: application/json' \
   --header 'Fineract-Platform-TenantId: default' \
   --header 'Authorization: Basic bWlmb3M6cGFzc3dvcmQ='
 ```
 
+Expected response for fresh instance:
+
+```json
+{"totalFilteredRecords":0,"pageItems":[]}
+```
+
 How to run for production
 ---
-Running Fineract to try it out is relatively easy. If you intend to use it in a production environment, be aware that a proper deployment can be complex, costly, and time-consuming. Considerations include: Security, privacy, compliance, performance, service availability, backups, and more. The Fineract project does not provide a comprehensive guide for deploying Fineract in production. You might need skills in enterprise Java applications and more. Alternatively, you could pay a vendor for Fineract deployment and maintenance. You will find tips and tricks for deploying and securing Fineract in our official documentation and in the community-maintained wiki.
+Running Fineract _just to try it out_ is relatively easy. If you intend to use it _in a production environment_, be aware that a proper deployment can be complex, costly, and time-consuming. Considerations include: Security, privacy, compliance, performance, service availability, backups, and more. **The Fineract project does not provide a comprehensive guide for deploying Fineract in production.** You might need skills in enterprise Java applications and more. Alternatively, you could pay a vendor for Fineract deployment and maintenance. You will find tips and tricks for [deploying](https://fineract.apache.org/docs/current/#_deployment) and [securing](https://fineract.apache.org/docs/current/#_securing_fineract) Fineract in our official documentation.
 
 
 How to build the JAR file
@@ -123,7 +124,7 @@ Build a modern, cloud native, fully self contained JAR file:
 ./gradlew clean bootJar
 ```
 The JAR will be created in the `fineract-provider/build/libs` directory.
-As we are not allowed to include a JDBC driver in the built JAR, download a JDBC driver of your choice. For example:
+If you use a MariaDB or MySQL (note: both are deprecated), you must download the appropriate JDBC driver since drivers for those databases use incompatible licenses. For example:
 ```bash
 wget https://dlm.mariadb.com/4174416/Connectors/java/connector-java-3.5.2/mariadb-java-client-3.5.2.jar
 ```
@@ -303,10 +304,10 @@ In case of a large deployment with millions of accounts, the Close of Business D
 JMS based messaging is disabled by default. In `docker-compose-postgresql-activemq.yml` an example is shown, where ActiveMQ is enabled. In that configuration one Spring Batch Manager instance and two Spring Batch Worker instances are created.
 Spring based events should be disabled and jms based event handling should be enabled. Furthermore, proper broker JMS URL should be configured.
 
-```
-      FINERACT_REMOTE_JOB_MESSAGE_HANDLER_JMS_ENABLED=true
-      FINERACT_REMOTE_JOB_MESSAGE_HANDLER_SPRING_EVENTS_ENABLED=false
-      FINERACT_REMOTE_JOB_MESSAGE_HANDLER_JMS_BROKER_URL=tcp://activemq:61616
+```bash
+FINERACT_REMOTE_JOB_MESSAGE_HANDLER_JMS_ENABLED=true
+FINERACT_REMOTE_JOB_MESSAGE_HANDLER_SPRING_EVENTS_ENABLED=false
+FINERACT_REMOTE_JOB_MESSAGE_HANDLER_JMS_BROKER_URL=tcp://activemq:61616
 ```
 
 For additional ActiveMQ related configuration please take a look to the `application.properties` where the supported configuration parameters are listed with their default values.
@@ -326,11 +327,21 @@ DATABASE AND TABLES
 
 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-12.2 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:12.2.2 --innodb-snapshot-isolation=OFF
+```bash
+# start postgresql in background
+docker run --name postgres -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=postgres -u nobody:nogroup -d postgres:18.3
+# stop and destroy container
+docker rm -f postgres
+```
 
-and stop and destroy it like this:
+Similarly, for one of the [deprecated](https://cwiki.apache.org/confluence/display/FINERACT/FSIP-9%3A+Standardize+on+PostgreSQL) database backends:
 
-    docker rm -f mariadb-12.2
+```bash
+# start mariadb in background
+docker run --name mariadb-12.2 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:12.2.2 --innodb-snapshot-isolation=OFF
+# stop and destroy container
+docker rm -f mariadb-12.2
+```
 
 Beware that this 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) regarding how to make it persistent instead of ephemeral.
 

build.gradle

@@ -917,6 +917,7 @@ cyclonedxBom {
 
 tasks.withType(org.cyclonedx.gradle.CyclonedxDirectTask).configureEach {
     includeMetadataResolution.set(false)
+    skipConfigs.set(['.*eclipse.*', '.*swt.*'])
 }
 
 tasks.register('printSourceSetInformation') {

fineract-accounting/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java

@@ -80,7 +80,6 @@ public class GLClosuresApiResource {
     private final OfficeReadPlatformService officeReadPlatformService;
 
     @GET
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "List Accounting closures", description = """
             Example Requests:
@@ -95,7 +94,6 @@ public List<GLClosureData> retrieveAllClosures(@QueryParam("officeId") @Paramete
 
     @GET
     @Path("{glClosureId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Retrieve an Accounting Closure", description = """
             Example Requests:
@@ -148,7 +146,6 @@ public CommandProcessingResult updateGLClosure(@PathParam("glClosureId") @Parame
 
     @DELETE
     @Path("{glClosureId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete an accounting closure", description = "Note: Only the latest accounting closure associated with a branch may be deleted.")
     @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.DeleteGlClosuresResponse.class)))

fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java

@@ -76,15 +76,13 @@ public class FinancialActivityAccountsApiResource {
 
     @GET
     @Path("template")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     public FinancialActivityAccountData retrieveTemplate() {
         context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.RESOURCE_NAME_FOR_PERMISSION);
         return financialActivityAccountReadPlatformService.getFinancialActivityAccountTemplate();
     }
 
     @GET
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "List Financial Activities to Accounts Mappings", description = """
             Example Requests:
@@ -97,7 +95,6 @@ public List<FinancialActivityAccountData> retrieveAll() {
 
     @GET
     @Path("{mappingId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Retrieve a Financial Activity to Account Mapping\n", description = """
             Example Requests:
@@ -148,7 +145,6 @@ public CommandProcessingResult updateGLAccount(@PathParam("mappingId") @Paramete
 
     @DELETE
     @Path("{mappingId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete a Financial Activity to Account Mapping", operationId = "deleteGLAccountMappingFinancialActivityAccount")
     @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.DeleteFinancialActivityAccountsResponse.class)))

fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java

@@ -92,7 +92,6 @@ public class GLAccountsApiResource {
 
     @GET
     @Path("template")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(tags = {
             "General Ledger Account" }, summary = "Retrieve GL Accounts Template", description = """
@@ -122,7 +121,6 @@ public GLAccountData retrieveNewAccountDetails(@QueryParam("type") @Parameter(de
     }
 
     @GET
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(tags = {
             "General Ledger Account" }, summary = "List General Ledger Account", description = """
@@ -153,7 +151,6 @@ public List<GLAccountData> retrieveAllAccounts(@QueryParam("type") @Parameter(de
 
     @GET
     @Path("{glAccountId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(tags = { "General Ledger Account" }, summary = "Retrieve a General Ledger Account", description = """
             Example Requests:
@@ -212,7 +209,6 @@ public CommandProcessingResult updateGLAccount(@PathParam("glAccountId") @Parame
 
     @DELETE
     @Path("{glAccountId}")
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(tags = {
             "General Ledger Account" }, summary = "Delete a GL Account", operationId = "deleteGLAccount", description = "Deletes a GL Account")

fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java

@@ -32,7 +32,7 @@ public enum GlAccountInvalidUpdateReason {
 
         public String errorMessage() {
             if (name().equalsIgnoreCase("TRANSANCTIONS_LOGGED")) {
-                return "This Usage of this (detail) GL Account as it already has transactions logged against it";
+                return "This (detail) GL Account cannot be updated as it already has transactions logged against it";
             }
             return name();
         }

fineract-accounting/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java

@@ -312,7 +312,6 @@ private List<ClassificationToGLAccountData> fetchClassificationMappings(final Po
                         : productToGLAccountMappingRepository.findAllBuyDownFeeClassificationsMappings(loanProductId,
                                 portfolioProductType.getValue());
 
-        productToGLAccountMappingRepository.findAllChargeOffReasonsMappings(loanProductId, portfolioProductType.getValue());
         List<ClassificationToGLAccountData> classificationToGLAccountMappers = mappings.isEmpty() ? null : new ArrayList<>();
         for (final ProductToGLAccountMapping mapping : mappings) {
             final Long glAccountId = mapping.getGlAccount().getId();