mapstruct fixes

kjozsa · Nov 14, 2024 · 91e291e · 91e291e
1 parent 0fc51a6
commit 91e291e
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 45 deletions.
diff --git a/custom/acme/event/starter/build.gradle b/custom/acme/event/starter/build.gradle
@@ -19,7 +19,22 @@
 description = 'ACME Corp.: Fineract Event Starter'
 
 group = 'com.acme.fineract.event'
-
 archivesBaseName = 'acme-fineract-event-starter'
 
+apply plugin: 'java'
+apply plugin: 'io.freefair.lombok'
+apply plugin: 'io.spring.dependency-management'
+
+dependencies {
+    implementation(
+            project(':fineract-core')
+            )
+
+    testImplementation(
+            'org.junit.jupiter:junit-jupiter',
+            'org.mockito:mockito-core',
+            'org.mockito:mockito-junit-jupiter'
+            )
+}
+
 apply from: 'dependencies.gradle'
diff --git a/custom/acme/loan/starter/build.gradle b/custom/acme/loan/starter/build.gradle
@@ -22,11 +22,9 @@ group = 'com.acme.fineract'
 
 archivesBaseName = 'acme-fineract-loan-starter'
 
-apply from: 'dependencies.gradle'
-
 apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.freefair.lombok'
+apply plugin: 'io.spring.dependency-management'
 
 dependencies {
     implementation(
@@ -40,3 +38,5 @@ dependencies {
             'org.mockito:mockito-junit-jupiter'
             )
 }
+
+apply from: 'dependencies.gradle'
diff --git a/custom/acme/note/starter/build.gradle b/custom/acme/note/starter/build.gradle
@@ -23,8 +23,8 @@ group = 'com.acme.fineract.portfolio.note'
 archivesBaseName = 'acme-fineract-note-starter'
 
 apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.freefair.lombok'
+apply plugin: 'io.spring.dependency-management'
 
 dependencies {
     implementation(

diff --git a/fineract-core/build.gradle b/fineract-core/build.gradle
@@ -19,52 +19,46 @@
 description = 'Fineract Core'
 
 apply plugin: 'java'
-apply plugin: 'eclipse'
+apply plugin: 'io.freefair.lombok'
+apply plugin: 'io.spring.dependency-management'
 
-compileJava.doLast {
-    def mainSS = sourceSets.main
-    def source = mainSS.java.classesDirectory.get()
-    copy {
-        from file("src/main/resources/jpa/core/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, '-classpath', sourceSets.main.runtimeClasspath, source, target
-        classpath sourceSets.main.runtimeClasspath
-    }
-    delete {
-        delete "${source}/META-INF/persistence.xml"
-    }
-}
+dependencies {
+    annotationProcessor(
+            'org.projectlombok:lombok',
+            'org.mapstruct:mapstruct-processor',
+            'org.springframework.boot:spring-boot-configuration-processor'
+            )
 
-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
+    testAnnotationProcessor(
+            'org.projectlombok:lombok',
+            'org.mapstruct:mapstruct-processor'
+            )
+
+    implementation(
+            'org.mapstruct:mapstruct',
+            'org.springframework.boot:spring-boot-starter-web',
+            'org.springframework.boot:spring-boot-starter-security',
+            'org.springframework.boot:spring-boot-starter-batch',
+            'org.springframework.batch:spring-batch-integration'
+            )
+
+    testImplementation(
+            'org.junit.jupiter:junit-jupiter',
+            'org.mockito:mockito-core',
+            'org.mockito:mockito-junit-jupiter'
+            )
 }
 
-apply from: 'dependencies.gradle'
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [
+        '-Amapstruct.defaultComponentModel=spring',
+        '-Amapstruct.suppressGeneratorTimestamp=true',
+        '-Amapstruct.suppressGeneratorVersionInfoComment=true',
+        '-Amapstruct.verbose=true'
+    ]
+}
 
 // Configuration for the modernizer plugin
-// https://github.com/andygoossens/gradle-modernizer-plugin
 modernizer {
     ignoreClassNamePatterns = [
         '.*AbstractPersistableCustom',
@@ -88,3 +82,5 @@ if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
         }
     }
 }
+
+apply from: 'dependencies.gradle'
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
@@ -38,6 +38,11 @@ dependencies {
             'org.springframework.boot:spring-boot-configuration-processor'
             )
 
+    testAnnotationProcessor(
+            'org.projectlombok:lombok',
+            'org.mapstruct:mapstruct-processor'
+            )
+
     implementation(
             project(':fineract-core'),
             project(':fineract-loan'),