0.8.92

babyfish-ct · Feb 8, 2024 · b06205a · b06205a
1 parent e6f6943
commit b06205a
Show file tree

Hide file tree

Showing 40 changed files with 2,230 additions and 2,267 deletions.
diff --git a/benchmark/benchmark-report.json b/benchmark/benchmark-report.json
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 ext {
-    jimmerVersion = "0.7.107"
+    jimmerVersion = "0.8.92"
 }
 
 group 'org.babyfish.jimmer'

diff --git a/benchmark/src/main/java/org/babyfish/jimmer/benchmark/OrmBenchmark.java b/benchmark/src/main/java/org/babyfish/jimmer/benchmark/OrmBenchmark.java
@@ -18,7 +18,6 @@
 import org.babyfish.jimmer.benchmark.springjdbc.SpringJdbcDataRepository;
 import org.babyfish.jimmer.benchmark.mybatis.MyBatisDataMapper;
 import org.babyfish.jimmer.sql.JSqlClient;
-import org.babyfish.jimmer.sql.ast.query.selectable.RootSelectable;
 import org.babyfish.jimmer.sql.kt.KSqlClient;
 import org.jooq.DSLContext;
 import org.ktorm.database.Database;

diff --git a/example/java/data-authorization/build.gradle b/example/java/data-authorization/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 ext {
-    jimmerVersion = "0.8.46"
+    jimmerVersion = "0.8.92"
 }
 
 group 'org.example'

diff --git a/...data-authorization/src/main/java/org/babyfish/jimmer/sql/example/service/FileService.java b/...data-authorization/src/main/java/org/babyfish/jimmer/sql/example/service/FileService.java
@@ -21,33 +21,20 @@ public class FileService implements Context {
     private static final Fetcher<File> UP_RECURSION =
             FileFetcher.$
                     .allScalarFields()
-                    .parent(
-                            FileFetcher.$.allScalarFields(),
-                            RecursiveFieldConfig::recursive
-                    );
+                    .recursiveParent();
 
     private static final Fetcher<File> DOWN_RECURSION =
             FileFetcher.$
                     .allScalarFields()
-                    .subFiles(
-                            FileFetcher.$.allScalarFields(),
-                            RecursiveListFieldConfig::recursive
-                    );
+                    .recursiveSubFiles();
 
     private static final Fetcher<File> DETAIL_DOWN_RECURSION =
             FileFetcher.$
                     .allScalarFields()
                     .authorizedUsers(
                             UserFetcher.$.allScalarFields()
                     )
-                    .subFiles(
-                            FileFetcher.$
-                                    .allScalarFields()
-                                    .authorizedUsers(
-                                            UserFetcher.$.allScalarFields()
-                                    ),
-                            RecursiveListFieldConfig::recursive
-                    );
+                    .recursiveSubFiles();
 
     public File findByPath(String path) {
         List<String> parts = Arrays.stream(SLASH_PATTERN.split(path))

diff --git a/example/java/jimmer-cloud/author-service/build.gradle b/example/java/jimmer-cloud/author-service/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     implementation(project(":model"))
 
     runtimeOnly 'com.h2database:h2'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.13'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

diff --git a/...hor-service/src/main/java/org/babyfish/jimmer/example/cloud/author/cfg/OpenAPIConfig.java b/...hor-service/src/main/java/org/babyfish/jimmer/example/cloud/author/cfg/OpenAPIConfig.java
diff --git a/example/java/jimmer-cloud/author-service/src/main/resources/application.yml b/example/java/jimmer-cloud/author-service/src/main/resources/application.yml
@@ -15,6 +15,9 @@ jimmer:
   client:
     ts:
       path: /author-service-ts.zip
+    openapi:
+      path: /open-api.yml
+      ui-path: /open-api.html
 
 server:
   port: 7003
@@ -23,7 +26,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:7000/eureka/
-
-springdoc:
-  swagger-ui:
-    path: /ui
diff --git a/example/java/jimmer-cloud/book-service/build.gradle b/example/java/jimmer-cloud/book-service/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     implementation(project(":model"))
 
     runtimeOnly 'com.h2database:h2'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.13'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

diff --git a/.../book-service/src/main/java/org/babyfish/jimmer/example/cloud/book/cfg/OpenAPIConfig.java b/.../book-service/src/main/java/org/babyfish/jimmer/example/cloud/book/cfg/OpenAPIConfig.java
diff --git a/example/java/jimmer-cloud/book-service/src/main/resources/application.yml b/example/java/jimmer-cloud/book-service/src/main/resources/application.yml
@@ -15,6 +15,9 @@ jimmer:
   client:
     ts:
       path: /book-service-ts.zip
+    openapi:
+      path: /open-api.yml
+      ui-path: /open-api.html
 
 server:
   port: 7002
@@ -23,7 +26,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:7000/eureka/
-
-springdoc:
-  swagger-ui:
-    path: /ui
diff --git a/example/java/jimmer-cloud/build.gradle b/example/java/jimmer-cloud/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    jimmerVersion = "0.8.77"
+    jimmerVersion = "0.8.92"
     springBootVersion = "2.7.0"
     springCloudVersion = "2021.0.6"
 }

diff --git a/example/java/jimmer-cloud/store-service/build.gradle b/example/java/jimmer-cloud/store-service/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     implementation(project(":model"))
 
     runtimeOnly 'com.h2database:h2'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.13'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

diff --git a/...tore-service/src/main/java/org/babyfish/jimmer/example/cloud/store/cfg/OpenAPIConfig.java b/...tore-service/src/main/java/org/babyfish/jimmer/example/cloud/store/cfg/OpenAPIConfig.java
diff --git a/example/java/jimmer-cloud/store-service/src/main/resources/application.yml b/example/java/jimmer-cloud/store-service/src/main/resources/application.yml
@@ -15,6 +15,9 @@ jimmer:
   client:
     ts:
       path: /store-service-ts.zip
+    openapi:
+      path: /open-api.yml
+      ui-path: /open-api.html
 
 server:
   port: 7001
@@ -23,7 +26,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:7000/eureka/
-
-springdoc:
-  swagger-ui:
-    path: /ui
diff --git a/example/java/jimmer-core/build.gradle b/example/java/jimmer-core/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 ext {
-    jimmerVersion = "0.8.77"
+    jimmerVersion = "0.8.92"
 }
 
 group 'org.babyfish.jimmer.example.core'

diff --git a/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/App.java b/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/App.java
@@ -2,6 +2,8 @@
 
 import org.babyfish.jimmer.example.core.model.*;
 
+import java.time.LocalDateTime;
+
 public class App {
 
     public static void main(String[] args) {
@@ -39,10 +41,19 @@ private static void bookDemo() {
          * Second step, make some "changes" based on the existing object to get a new object.
          */
         Book newBook = Objects.createBook(book, b -> {
+
             b.setName(b.name() + "!");
-            b.store().setName(b.store().name() + "!");
+            b.setLastModifiedTime(LocalDateTime.now());
+
+            BookStoreDraft store = b.store();
+            if (store != null) {
+                store.setName(store.name() + "!");
+                store.setLastModifiedTime(LocalDateTime.now());
+            }
+
             for (AuthorDraft author : b.authors(false)) {
                 author.setName(author.name() + "!");
+                author.setLastModifiedTime(LocalDateTime.now());
             }
         });
 

diff --git a/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/Author.java b/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/Author.java
@@ -3,6 +3,7 @@
 import org.babyfish.jimmer.Immutable;
 
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Immutable
@@ -11,5 +12,7 @@ public interface Author {
     @Size(max = 50)
     String name();
 
+    LocalDateTime lastModifiedTime();
+
     List<Book> books();
 }
diff --git a/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/Book.java b/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/Book.java
@@ -1,9 +1,11 @@
 package org.babyfish.jimmer.example.core.model;
 
 import org.babyfish.jimmer.Immutable;
+import org.jetbrains.annotations.Nullable;
 
 import javax.validation.constraints.Null;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Immutable
@@ -17,5 +19,7 @@ public interface Book {
 
     int price();
 
+    LocalDateTime lastModifiedTime();
+
     List<Author> authors();
 }
diff --git a/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/BookStore.java b/example/java/jimmer-core/src/main/java/org/babyfish/jimmer/example/core/model/BookStore.java
@@ -4,6 +4,7 @@
 
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Immutable
@@ -13,5 +14,7 @@ public interface BookStore {
     @Size(max = 50)
     String name();
 
+    LocalDateTime lastModifiedTime();
+
     List<Book> books();
 }
diff --git a/example/java/jimmer-sql-graphql/build.gradle b/example/java/jimmer-sql-graphql/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    jimmerVersion = "0.8.77"
+    jimmerVersion = "0.8.92"
     springBootVersion = "2.7.0"
 }
 

diff --git a/example/java/jimmer-sql/build.gradle b/example/java/jimmer-sql/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    jimmerVersion = "0.8.91"
+    jimmerVersion = "0.8.92"
     springBootVersion = "2.7.0"
 }
 

diff --git a/example/java/save-command/build.gradle b/example/java/save-command/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 ext {
-    jimmerVersion = "0.8.77"
+    jimmerVersion = "0.8.92"
 }
 
 group 'org.example'

diff --git a/...e-command/src/test/java/org/babyfish/jimmer/example/save/common/AbstractMutationTest.java b/...e-command/src/test/java/org/babyfish/jimmer/example/save/common/AbstractMutationTest.java
@@ -1,6 +1,5 @@
 package org.babyfish.jimmer.example.save.common;
 
-import org.babyfish.jimmer.example.save.model.JimmerModule;
 import org.babyfish.jimmer.sql.JSqlClient;
 import org.babyfish.jimmer.sql.dialect.H2Dialect;
 import org.babyfish.jimmer.sql.runtime.*;
@@ -36,7 +35,6 @@ public void beforeTest() throws SQLException {
         executedStatements = new ArrayList<>();
         JSqlClient.Builder builder = JSqlClient
                 .newBuilder()
-                .setEntityManager(JimmerModule.ENTITY_MANAGER)
                 .setDialect(new H2Dialect())
                 .setExecutor(new RecordSqlExecutor())
                 .setConnectionManager(new ExistsConnectionManager());

diff --git a/example/kotlin/jimmer-cloud-kt/author-service/build.gradle.kts b/example/kotlin/jimmer-cloud-kt/author-service/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
 
     runtimeOnly("com.h2database:h2:2.1.212")
-    implementation("org.springdoc:springdoc-openapi-ui:1.6.11")
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/example/kotlin/jimmer-cloud-kt/author-service/src/main/resources/application.yml b/example/kotlin/jimmer-cloud-kt/author-service/src/main/resources/application.yml
@@ -16,6 +16,9 @@ jimmer:
   client:
     ts:
       path: /author-service-ts.zip
+    openapi:
+      path: /open-api.yml
+      ui-path: /open-api.html
 
 server:
   port: 7003
@@ -24,7 +27,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:7000/eureka/
-
-springdoc:
-  swagger-ui:
-    path: /ui
diff --git a/example/kotlin/jimmer-cloud-kt/book-service/build.gradle.kts b/example/kotlin/jimmer-cloud-kt/book-service/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
 
     runtimeOnly("com.h2database:h2:2.1.212")
-    implementation("org.springdoc:springdoc-openapi-ui:1.6.11")
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/example/kotlin/jimmer-cloud-kt/book-service/src/main/resources/application.yml b/example/kotlin/jimmer-cloud-kt/book-service/src/main/resources/application.yml
@@ -16,6 +16,9 @@ jimmer:
   client:
     ts:
       path: /book-service-ts.zip
+    openapi:
+      path: /open-api.yml
+      ui-path: /open-api.html
 
 server:
   port: 7002
@@ -24,7 +27,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:7000/eureka/
-
-springdoc:
-  swagger-ui:
-    path: /ui
diff --git a/example/kotlin/jimmer-cloud-kt/build.gradle.kts b/example/kotlin/jimmer-cloud-kt/build.gradle.kts
@@ -1,4 +1,4 @@
-val jimmerVersion by extra { "0.8.77" }
+val jimmerVersion by extra { "0.8.92" }
 
 allprojects {
     group = "org.babyfish.jimmer.example.cloud.kt"

diff --git a/example/kotlin/jimmer-cloud-kt/store-service/build.gradle.kts b/example/kotlin/jimmer-cloud-kt/store-service/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
 
     runtimeOnly("com.h2database:h2:2.1.212")
-    implementation("org.springdoc:springdoc-openapi-ui:1.6.11")
 }
 
 tasks.withType<KotlinCompile> {