Rework on dependencies (#61)

p3t · Nov 7, 2024 · 66aa427 · 66aa427
1 parent 2559b60
commit 66aa427
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 
 .gradle
 build/
+target/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/

diff --git a/cursorpaging-jpa-api/build.gradle.kts b/cursorpaging-jpa-api/build.gradle.kts
@@ -19,19 +19,40 @@ repositories {
 
 dependencies {
 	api(project(":cursorpaging-jpa"))
-	implementation("com.google.protobuf:protobuf-java:4.28.3")
-	api("org.springframework:spring-core")
-	implementation("org.springframework.boot:spring-boot-starter-validation")
-	implementation("com.fasterxml.jackson.core:jackson-databind")
+	implementation("org.springframework:spring-core")
 	api("jakarta.validation:jakarta.validation-api")
-	api("jakarta.persistence:jakarta.persistence-api:3.2.0")
 
-	testImplementation("org.mockito:mockito-core:5.14.2")
-	testImplementation("jakarta.persistence:jakarta.persistence-api:3.2.0")
+	implementation("com.fasterxml.jackson.core:jackson-annotations")
+	implementation("com.fasterxml.jackson.core:jackson-core")
+	implementation("com.fasterxml.jackson.core:jackson-databind")
+//	implementation("com.fasterxml.jackson.core:jackson-datatype-jsr310")
+	implementation("com.google.protobuf:protobuf-java:4.28.3")
+
+	testImplementation("jakarta.persistence:jakarta.persistence-api")
+	testImplementation("org.hibernate.orm:hibernate-jpamodelgen")
+	testImplementation("org.assertj:assertj-core")
+	testImplementation("org.hibernate.orm:hibernate-core")
+	testImplementation("jakarta.transaction:jakarta.transaction-api")
+	testImplementation("org.springframework.boot:spring-boot-testcontainers")
+	testImplementation("org.springframework.boot:spring-boot-test")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.springframework.retry:spring-retry")
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation("org.testcontainers:testcontainers")
+	testImplementation("org.testcontainers:junit-jupiter")
+	testImplementation("org.testcontainers:postgresql")
 
+	testAnnotationProcessor("org.hibernate:hibernate-jpamodelgen:6.6.1.Final")
+	testRuntimeOnly("org.postgresql:postgresql")
+}
+publishing {
+	publications.named<MavenPublication>("mavenJava") {
+		pom {
+			description = "Serialization/Deserialization support of page-request for Spring-CursorPaging"
+		}
+	}
 }
-
 tasks {
 	withType<Test> {
 		useJUnitPlatform()

diff --git a/cursorpaging-jpa-api/src/main/java/io/vigier/cursorpaging/jpa/serializer/ToDtoMapper.java b/cursorpaging-jpa-api/src/main/java/io/vigier/cursorpaging/jpa/serializer/ToDtoMapper.java
@@ -26,15 +26,20 @@
 @RequiredArgsConstructor( staticName = "of" )
 class ToDtoMapper<E> {
 
-    private static final Map<Class<? extends Filter>, FilterType> TYPE_MAP = Map.of( //
-            EqualFilter.class, FilterType.EQ, //
-            GreaterThanFilter.class, FilterType.GT, //
-            LessThanFilter.class, FilterType.LT, //
-            LikeFilter.class, FilterType.LIKE //
-    );
-    private static final Map<Class<? extends FilterList>, FilterListType> LISTTYPE_MAP = Map.of( //
-            AndFilter.class, FilterListType.AND, //
-            OrFilter.class, FilterListType.OR );
+    private static final Map<Class<? extends Filter>, FilterType> TYPE_MAP;
+    private static final Map<Class<? extends FilterList>, FilterListType> LISTTYPE_MAP;
+
+    static {
+        TYPE_MAP = Map.of( //
+                EqualFilter.class, FilterType.EQ, //
+                GreaterThanFilter.class, FilterType.GT, //
+                LessThanFilter.class, FilterType.LT, //
+                LikeFilter.class, FilterType.LIKE //
+        );
+        LISTTYPE_MAP = Map.of( //
+                AndFilter.class, FilterListType.AND, //
+                OrFilter.class, FilterListType.OR );
+    }
 
     private final PageRequest<E> pageRequest;
 

diff --git a/cursorpaging-jpa/build.gradle.kts b/cursorpaging-jpa/build.gradle.kts
@@ -11,21 +11,37 @@ ext["artifactId"] = findProperty("artifactId") ?: "cursorpaging-jpa"
 
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-jdbc")
     api("jakarta.validation:jakarta.validation-api")
-//    implementation("org.springframework.data:spring-data-commons")
-//    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+    api("jakarta.persistence:jakarta.persistence-api")
+    api("org.springframework.data:spring-data-jpa")
+    implementation("org.springframework.boot:spring-boot-autoconfigure")
+    implementation("org.yaml:snakeyaml")
 
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.junit.jupiter:junit-jupiter")
+
+    testImplementation("org.hibernate.orm:hibernate-core")
+    testImplementation("jakarta.transaction:jakarta.transaction-api")
     testImplementation("org.springframework.boot:spring-boot-testcontainers")
+    testImplementation("org.springframework.boot:spring-boot-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.retry:spring-retry")
+    testImplementation("org.mockito:mockito-core")
+    testImplementation("org.mockito:mockito-junit-jupiter")
+    testImplementation("org.testcontainers:testcontainers")
     testImplementation("org.testcontainers:junit-jupiter")
     testImplementation("org.testcontainers:postgresql")
-    testImplementation("org.springframework.retry:spring-retry")
+    testImplementation("org.assertj:assertj-core")
     testAnnotationProcessor("org.hibernate:hibernate-jpamodelgen:6.6.1.Final")
     testRuntimeOnly("org.postgresql:postgresql")
 }
 
+publishing {
+    publications.named<MavenPublication>("mavenJava") {
+        pom {
+            description = "Cursor based paging support for Spring Data JPA repositories"
+        }
+    }
+}
+
 tasks.test {
     useJUnitPlatform()
 }