Merge remote-tracking branch 'origin/master' into vars

Author: velo

.circleci/config.yml

@@ -140,7 +140,7 @@ jobs:
       - run:
           name: 'Test'
           command: |
-            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc -am -T2
+            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am -T2
             ./mvnw -ntp -B verify -Pexamples -rf :querydsl-examples
       - save-test-results
   buildQuarkusExample:

querydsl-examples/pom.xml

@@ -12,6 +12,10 @@
   <packaging>pom</packaging>
   <name>Querydsl - Examples</name>
 
+  <properties>
+    <main.java.version>17</main.java.version>
+  </properties>
+
   <modules>
     <module>querydsl-example-sql-guice</module>
     <module>querydsl-example-sql-spring</module>

querydsl-examples/querydsl-example-jpa-quarkus/src/main/java/com/querydsl/example/FruitResource.java

@@ -100,8 +100,8 @@ public Response toResponse(Exception exception) {
       LOGGER.error("Failed to handle request", exception);
 
       var code = 500;
-      if (exception instanceof WebApplicationException) {
-        code = ((WebApplicationException) exception).getResponse().getStatus();
+      if (exception instanceof WebApplicationException applicationException) {
+        code = applicationException.getResponse().getStatus();
       }
 
       var exceptionJson = objectMapper.createObjectNode();

querydsl-examples/querydsl-example-jpa-spring/pom.xml

@@ -10,11 +10,6 @@
   <artifactId>querydsl-example-jpa-spring</artifactId>
   <name>Querydsl example - JPA Spring</name>
 
-  <properties>
-    <!-- to match spring JDK version -->
-    <main.java.version>17</main.java.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

querydsl-examples/querydsl-example-jpa-spring/src/main/java/com/querydsl/example/Customer.java

@@ -24,7 +24,7 @@ public Customer(String firstName, String lastName) {
 
   @Override
   public String toString() {
-    return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
+    return "Customer[id=%d, firstName='%s', lastName='%s']".formatted(id, firstName, lastName);
   }
 
   public Long getId() {

querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml

@@ -11,13 +11,6 @@
   <artifactId>querydsl-example-r2dbc-sql-codegen</artifactId>
   <name>Querydsl example - R2DBC SQL Codegen</name>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!-- to match spring JDK version -->
-    <main.java.version>17</main.java.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -31,9 +24,7 @@
   </dependencyManagement>
 
   <dependencies>
-
     <!-- spring -->
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

querydsl-examples/querydsl-example-sql-spring/pom.xml

@@ -11,17 +11,8 @@
   <artifactId>querydsl-example-sql-spring</artifactId>
   <name>Querydsl example - SQL Spring</name>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!-- to match spring JDK version -->
-    <main.java.version>17</main.java.version>
-  </properties>
-
   <dependencies>
-
     <!-- spring -->
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -51,6 +42,11 @@
       <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.github.openfeign.querydsl</groupId>
+      <artifactId>querydsl-sql-json</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.github.openfeign.querydsl</groupId>
       <artifactId>querydsl-sql-spring</artifactId>
@@ -90,6 +86,13 @@
             <customType>com.querydsl.sql.types.LocalDateTimeType</customType>
             <customType>com.querydsl.sql.types.LocalDateType</customType>
           </customTypes>
+          <typeMappings>
+            <typeMapping>
+              <table>CUSTOMER_ADDRESS</table>
+              <column>ADDRESS</column>
+              <type>com.querydsl.example.dto.Address</type>
+            </typeMapping>
+          </typeMappings>
           <packageName>com.querydsl.example.sql</packageName>
           <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
         </configuration>

querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/JdbcConfiguration.java

@@ -6,6 +6,7 @@
 import com.querydsl.sql.spring.SpringExceptionTranslator;
 import com.querydsl.sql.types.LocalDateTimeType;
 import com.querydsl.sql.types.LocalDateType;
+import io.github.openfeign.querydsl.sql.json.types.JSONType;
 import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -50,6 +51,7 @@ public com.querydsl.sql.Configuration querydslConfiguration() {
     configuration.setExceptionTranslator(new SpringExceptionTranslator());
     configuration.register(new LocalDateTimeType());
     configuration.register(new LocalDateType());
+    configuration.register(new JSONType());
     return configuration;
   }
 

querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java

@@ -1,15 +1,13 @@
 package com.querydsl.example.dao;
 
 import static com.querydsl.core.types.Projections.bean;
-import static com.querydsl.example.sql.QAddress.address;
 import static com.querydsl.example.sql.QCustomer.customer;
 import static com.querydsl.example.sql.QCustomerAddress.customerAddress;
 import static com.querydsl.example.sql.QPerson.person;
 
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.QBean;
-import com.querydsl.example.dto.Address;
 import com.querydsl.example.dto.Customer;
 import com.querydsl.example.dto.CustomerAddress;
 import com.querydsl.example.dto.Person;
@@ -29,7 +27,7 @@ public class CustomerDaoImpl implements CustomerDao {
           customerAddress.addressTypeCode,
           customerAddress.fromDate,
           customerAddress.toDate,
-          bean(Address.class, address.all()).as("address"));
+          customerAddress.address);
 
   final QBean<Customer> customerBean =
       bean(
@@ -51,7 +49,6 @@ public List<Customer> findAll(Predicate... where) {
         .from(customer)
         .leftJoin(customer.contactPersonFk, person)
         .leftJoin(customer._customer3Fk, customerAddress)
-        .leftJoin(customerAddress.addressFk, address)
         .where(where)
         .transform(GroupBy.groupBy(customer.id).list(customerBean));
   }
@@ -82,14 +79,9 @@ public Customer save(Customer c) {
 
     var insert = queryFactory.insert(customerAddress);
     for (CustomerAddress ca : c.getAddresses()) {
-      if (ca.getAddress().getId() == null) {
-        ca.getAddress()
-            .setId(
-                queryFactory.insert(address).populate(ca.getAddress()).executeWithKey(address.id));
-      }
       insert
           .set(customerAddress.customerId, id)
-          .set(customerAddress.addressId, ca.getAddress().getId())
+          .set(customerAddress.address, ca.getAddress())
           .set(customerAddress.addressTypeCode, ca.getAddressTypeCode())
           .set(customerAddress.fromDate, ca.getFromDate())
           .set(customerAddress.toDate, ca.getToDate())

querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Address.java

@@ -1,9 +1,10 @@
 package com.querydsl.example.dto;
 
+import io.github.openfeign.querydsl.sql.json.*;
 import lombok.Data;
 
 @Data
-public class Address {
+public class Address implements JsonEntity {
 
   private Long id;