You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2024/06/17 15:55:27 UTC
(fineract) branch develop updated: FINERACT-1932: Fineract modularization - fineract-report
This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 3b603f5e8 FINERACT-1932: Fineract modularization - fineract-report
3b603f5e8 is described below
commit 3b603f5e80b9ba9811d96febe8dc827dd31d09a3
Author: Jose Alberto Hernandez <al...@black-box.local>
AuthorDate: Wed Jun 12 21:03:06 2024 -0600
FINERACT-1932: Fineract modularization - fineract-report
---
build.gradle | 2 +
fineract-provider/dependencies.gradle | 1 +
fineract-report/build.gradle | 106 +++++++++++++++++++++
fineract-report/dependencies.gradle | 74 ++++++++++++++
.../report/annotation/ReportService.java | 0
.../provider/ReportingProcessServiceProvider.java | 0
.../service/AbstractReportingProcessService.java | 0
.../report/service/ReportingProcessService.java | 0
.../src/main/resources/jpa/report/persistence.xml | 76 +++++++++++++++
settings.gradle | 1 +
10 files changed, 260 insertions(+)
diff --git a/build.gradle b/build.gradle
index e7aecfce2..4832bb4ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ buildscript {
'fineract-rates',
'fineract-loan',
'fineract-savings',
+ 'fineract-report',
'integration-tests',
'twofactor-tests',
'oauth2-tests',
@@ -60,6 +61,7 @@ buildscript {
'fineract-rates',
'fineract-loan',
'fineract-savings',
+ 'fineract-report',
'fineract-branch',
'fineract-document',
'fineract-progressive-loan'
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index 075cb7ecb..ad0a2a342 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -34,6 +34,7 @@ dependencies {
implementation(project(path: ':fineract-branch'))
implementation(project(path: ':fineract-document'))
implementation(project(path: ':fineract-progressive-loan'))
+ implementation(project(path: ':fineract-report'))
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
diff --git a/fineract-report/build.gradle b/fineract-report/build.gradle
new file mode 100644
index 000000000..f7239ebd4
--- /dev/null
+++ b/fineract-report/build.gradle
@@ -0,0 +1,106 @@
+/**
+ * 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.
+ */
+description = 'Fineract Report'
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+compileJava.doLast {
+ def mainSS = sourceSets.main
+ def source = mainSS.java.classesDirectory.get()
+ copy {
+ from file("src/main/resources/jpa/report/persistence.xml")
+ into "${source}/META-INF/"
+ }
+ javaexec {
+ description = 'Performs EclipseLink static weaving of entity classes'
+ def target = source
+ main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
+ args '-persistenceinfo', source, source, target
+ classpath sourceSets.main.runtimeClasspath
+ }
+ delete {
+ delete "${source}/META-INF/persistence.xml"
+ }
+}
+
+// Configuration for Swagger documentation generation task
+// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
+import org.apache.tools.ant.filters.ReplaceTokens
+
+
+
+configurations {
+ providedRuntime // needed for Spring Boot executable WAR
+ providedCompile
+ compile() {
+ exclude module: 'hibernate-entitymanager'
+ exclude module: 'hibernate-validator'
+ exclude module: 'activation'
+ exclude module: 'bcmail-jdk14'
+ exclude module: 'bcprov-jdk14'
+ exclude module: 'bctsp-jdk14'
+ exclude module: 'c3p0'
+ exclude module: 'stax-api'
+ exclude module: 'jaxb-api'
+ exclude module: 'jaxb-impl'
+ exclude module: 'jboss-logging'
+ exclude module: 'itext-rtf'
+ exclude module: 'classworlds'
+ }
+ runtime
+}
+
+apply from: 'dependencies.gradle'
+
+// Configuration for the modernizer plugin
+// https://github.com/andygoossens/gradle-modernizer-plugin
+modernizer {
+ ignoreClassNamePatterns = [
+ '.*AbstractPersistableCustom',
+ '.*EntityTables',
+ '.*domain.*'
+ ]
+}
+
+// If we are running Gradle within Eclipse to enhance classes with OpenJPA,
+// set the classes directory to point to Eclipse's default build directory
+if (project.hasProperty('env') && project.getProperty('env') == 'eclipse') {
+ sourceSets.main.java.outputDir = new File(rootProject.projectDir, "fineract-report/bin/main")
+}
+
+eclipse {
+ project {
+ buildCommand([ LaunchConfigHandle: "<project>/.externalToolBuilders/OpenJPA Enhance Builder.launch" ], 'org.eclipse.ui.externaltools.ExternalToolBuilder')
+ }
+}
+
+/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
+sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
+sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
+
+if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
+ sourceSets {
+ test {
+ java {
+ exclude '**/core/boot/tests/**'
+ }
+ }
+ }
+}
diff --git a/fineract-report/dependencies.gradle b/fineract-report/dependencies.gradle
new file mode 100644
index 000000000..bd2a15867
--- /dev/null
+++ b/fineract-report/dependencies.gradle
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ */
+
+dependencies {
+ // Never use "compile" scope, but make all dependencies either 'implementation', 'runtimeOnly' or 'testCompile'.
+ // Note that we never use 'api', because Fineract at least currently is a simple monolithic application ("WAR"), not a library.
+ // We also (normally should have) no need to ever use 'compileOnly'.
+
+ // implementation dependencies are directly used (compiled against) in src/main (and src/test)
+ //
+ implementation(project(path: ':fineract-core'))
+
+ implementation(
+ 'org.springframework.boot:spring-boot-starter-web',
+ 'org.springframework.boot:spring-boot-starter-security',
+ 'jakarta.ws.rs:jakarta.ws.rs-api',
+ 'org.glassfish.jersey.media:jersey-media-multipart',
+
+ 'com.google.guava:guava',
+ 'com.google.code.gson:gson',
+
+ 'org.apache.commons:commons-lang3',
+
+ 'com.jayway.jsonpath:json-path',
+
+ 'com.github.spotbugs:spotbugs-annotations',
+ 'io.swagger.core.v3:swagger-annotations-jakarta',
+
+ 'com.squareup.retrofit2:converter-gson',
+
+ 'org.springdoc:springdoc-openapi-starter-webmvc-ui',
+ 'org.mapstruct:mapstruct',
+
+ 'io.github.resilience4j:resilience4j-spring-boot3',
+ 'org.apache.httpcomponents:httpcore',
+ )
+ compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
+ annotationProcessor 'org.mapstruct:mapstruct-processor'
+ implementation ('org.springframework.boot:spring-boot-starter-data-jpa') {
+ exclude group: 'org.hibernate'
+ }
+ implementation('org.eclipse.persistence:org.eclipse.persistence.jpa') {
+ exclude group: 'org.eclipse.persistence', module: 'jakarta.persistence'
+ }
+ // testCompile dependencies are ONLY used in src/test, not src/main.
+ // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly!
+ //
+ testImplementation( 'io.github.classgraph:classgraph' )
+ testImplementation ('org.springframework.boot:spring-boot-starter-test') {
+ exclude group: 'com.jayway.jsonpath', module: 'json-path'
+ exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+ exclude group: 'jakarta.activation'
+ exclude group: 'javax.activation'
+ exclude group: 'org.skyscreamer'
+ }
+ testImplementation ('org.mockito:mockito-inline')
+}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/annotation/ReportService.java b/fineract-report/src/main/java/org/apache/fineract/infrastructure/report/annotation/ReportService.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/annotation/ReportService.java
rename to fineract-report/src/main/java/org/apache/fineract/infrastructure/report/annotation/ReportService.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/provider/ReportingProcessServiceProvider.java b/fineract-report/src/main/java/org/apache/fineract/infrastructure/report/provider/ReportingProcessServiceProvider.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/provider/ReportingProcessServiceProvider.java
rename to fineract-report/src/main/java/org/apache/fineract/infrastructure/report/provider/ReportingProcessServiceProvider.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/service/AbstractReportingProcessService.java b/fineract-report/src/main/java/org/apache/fineract/infrastructure/report/service/AbstractReportingProcessService.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/service/AbstractReportingProcessService.java
rename to fineract-report/src/main/java/org/apache/fineract/infrastructure/report/service/AbstractReportingProcessService.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/service/ReportingProcessService.java b/fineract-report/src/main/java/org/apache/fineract/infrastructure/report/service/ReportingProcessService.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/report/service/ReportingProcessService.java
rename to fineract-report/src/main/java/org/apache/fineract/infrastructure/report/service/ReportingProcessService.java
diff --git a/fineract-report/src/main/resources/jpa/report/persistence.xml b/fineract-report/src/main/resources/jpa/report/persistence.xml
new file mode 100644
index 000000000..d3ba0d405
--- /dev/null
+++ b/fineract-report/src/main/resources/jpa/report/persistence.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+
+
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+
+ <!-- This file is only used for static weaving, nothing more. -->
+ <!-- You can find the runtime configuration in the JPAConfig class -->
+ <persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <!-- Fineract core module -->
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+ <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
+ <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+ <class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="eclipselink.weaving" value="static" />
+ </properties>
+ </persistence-unit>
+</persistence>
diff --git a/settings.gradle b/settings.gradle
index e449c052e..ca2a4855e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -58,6 +58,7 @@ include ':fineract-rates'
include ':fineract-charge'
include ':fineract-loan'
include ':fineract-savings'
+include ':fineract-report'
include ':fineract-war'
include ':integration-tests'
include ':twofactor-tests'