Bumped spring boot to 2.3.5

kai-niemi · kai-niemi · commit 80155776b01e · 2020-11-05T08:47:28.000+01:00
Renamed spring-data-jpa-json -&gt; spring-data-json
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
+        <version>2.3.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -23,7 +23,7 @@
         <module>roach-data-jooq</module>
         <module>roach-data-jdbc</module>
         <module>roach-data-jpa</module>
-        <module>roach-data-jpa-json</module>
+        <module>roach-data-json</module>
         <module>roach-data-mybatis</module>
     </modules>
 
diff --git a/roach-data-jdbc/src/main/resources/application.yml b/roach-data-jdbc/src/main/resources/application.yml
@@ -21,8 +21,8 @@ spring:
     username: root
     password:
     hikari:
-      connection-test-query: SELECT 1
       maximum-pool-size: 4
+      connection-init-sql: SELECT 1
 
   jpa:
     open-in-view: false
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/Account.java b/roach-data-jpa/src/main/java/io/roach/data/json/Account.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.math.BigDecimal;
 
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/AccountController.java b/roach-data-jpa/src/main/java/io/roach/data/json/AccountController.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.math.BigDecimal;
 
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/AccountModel.java b/roach-data-jpa/src/main/java/io/roach/data/json/AccountModel.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.math.BigDecimal;
 
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/AccountRepository.java b/roach-data-jpa/src/main/java/io/roach/data/json/AccountRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.math.BigDecimal;
 
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/AccountType.java b/roach-data-jpa/src/main/java/io/roach/data/json/AccountType.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 public enum AccountType {
     asset,
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/JpaApplication.java b/roach-data-jpa/src/main/java/io/roach/data/json/JpaApplication.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.math.BigDecimal;
 import java.util.ArrayDeque;
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/NegativeBalanceException.java b/roach-data-jpa/src/main/java/io/roach/data/json/NegativeBalanceException.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;
diff --git a/roach-data-jpa/src/main/java/io/roach/data/json/RetryableTransactionAspect.java b/roach-data-jpa/src/main/java/io/roach/data/json/RetryableTransactionAspect.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/roach-data-json/README.md b/roach-data-json/README.md
diff --git a/roach-data-json/pom.xml b/roach-data-json/pom.xml
@@ -8,7 +8,7 @@
         <version>1.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
-    <artifactId>roach-data-jpa-json</artifactId>
+    <artifactId>roach-data-json</artifactId>
 
     <dependencies>
         <dependency>
@@ -54,6 +54,11 @@
             <artifactId>postgresql</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.ttddyy</groupId>
+            <artifactId>datasource-proxy</artifactId>
+            <version>1.7</version>
+        </dependency>
 
         <!-- ======================================================== -->
         <!-- Test -->
diff --git a/roach-data-json/src/main/java/io/roach/data/json/DataSourceConfig.java b/roach-data-json/src/main/java/io/roach/data/json/DataSourceConfig.java
@@ -0,0 +1,35 @@
+package io.roach.data.json;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.sql.DataSource;
+
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import net.ttddyy.dsproxy.listener.ChainListener;
+import net.ttddyy.dsproxy.listener.DataSourceQueryCountListener;
+import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel;
+import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
+
+@Configuration
+public class DataSourceConfig {
+    @Bean
+    @Primary
+    public DataSource dataSource(DataSourceProperties properties) {
+        ChainListener listener = new ChainListener();
+        listener.addListener(new DataSourceQueryCountListener());
+        return ProxyDataSourceBuilder
+                .create(properties.initializeDataSourceBuilder().build())
+                .name("SQL-Trace")
+                .listener(listener)
+                .asJson()
+                .countQuery()
+                .logQueryBySlf4j(SLF4JLogLevel.DEBUG, "io.roach.sql_trace")
+                .logSlowQueryBySlf4j(50, TimeUnit.MILLISECONDS)
+//                .multiline()
+                .build();
+    }
+}
diff --git a/roach-data-json/src/main/java/io/roach/data/json/JsonApplication.java b/roach-data-json/src/main/java/io/roach/data/json/JsonApplication.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,11 +16,11 @@
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableTransactionManagement(order = Ordered.LOWEST_PRECEDENCE - 1) // Bump up one level to enable extra advisors
 @SpringBootApplication
-public class JpaJsonApplication {
-    protected static final Logger logger = LoggerFactory.getLogger(JpaJsonApplication.class);
+public class JsonApplication {
+    protected static final Logger logger = LoggerFactory.getLogger(JsonApplication.class);
 
     public static void main(String[] args) {
-        new SpringApplicationBuilder(JpaJsonApplication.class)
+        new SpringApplicationBuilder(JsonApplication.class)
                 .web(WebApplicationType.SERVLET)
                 .run(args);
     }
diff --git a/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistory.java b/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistory.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.chat;
+package io.roach.data.json.chat;
 
 import java.util.List;
 import java.util.UUID;
@@ -10,7 +10,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-import io.roach.data.jpa.support.AbstractJsonDataType;
+import io.roach.data.json.support.AbstractJsonDataType;
 
 @Entity
 @Table(name = "chat_history")
diff --git a/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistoryController.java b/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistoryController.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.chat;
+package io.roach.data.json.chat;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistoryRepository.java b/roach-data-json/src/main/java/io/roach/data/json/chat/ChatHistoryRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.chat;
+package io.roach.data.json.chat;
 
 import java.util.UUID;
 
diff --git a/roach-data-json/src/main/java/io/roach/data/json/department/Address.java b/roach-data-json/src/main/java/io/roach/data/json/department/Address.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.department;
+package io.roach.data.json.department;
 
 public class Address {
     public static class Builder {
diff --git a/roach-data-json/src/main/java/io/roach/data/json/department/Department.java b/roach-data-json/src/main/java/io/roach/data/json/department/Department.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.department;
+package io.roach.data.json.department;
 
 import java.util.List;
 import java.util.UUID;
@@ -8,7 +8,7 @@
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 
-import io.roach.data.jpa.support.AbstractJsonDataType;
+import io.roach.data.json.support.AbstractJsonDataType;
 
 @Entity
 @Table(name = "department")
diff --git a/roach-data-json/src/main/java/io/roach/data/json/department/DepartmentRepository.java b/roach-data-json/src/main/java/io/roach/data/json/department/DepartmentRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.department;
+package io.roach.data.json.department;
 
 import java.util.UUID;
 
diff --git a/roach-data-json/src/main/java/io/roach/data/json/department/User.java b/roach-data-json/src/main/java/io/roach/data/json/department/User.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.department;
+package io.roach.data.json.department;
 
 public class User {
     private String userName;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/Account.java b/roach-data-json/src/main/java/io/roach/data/json/journal/Account.java
@@ -1,12 +1,12 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
 import javax.persistence.*;
 
-import io.roach.data.jpa.support.AbstractJsonDataType;
+import io.roach.data.json.support.AbstractJsonDataType;
 
 @Entity
 @Table(name = "account",
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/AccountJournal.java b/roach-data-json/src/main/java/io/roach/data/json/journal/AccountJournal.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/AccountJournalRepository.java b/roach-data-json/src/main/java/io/roach/data/json/journal/AccountJournalRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/AccountRepository.java b/roach-data-json/src/main/java/io/roach/data/json/journal/AccountRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.util.UUID;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/Journal.java b/roach-data-json/src/main/java/io/roach/data/json/journal/Journal.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.time.LocalDateTime;
 
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/Transaction.java b/roach-data-json/src/main/java/io/roach/data/json/journal/Transaction.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import io.roach.data.jpa.support.AbstractJsonDataType;
-import io.roach.data.jpa.support.LocalDateDeserializer;
-import io.roach.data.jpa.support.LocalDateSerializer;
+import io.roach.data.json.support.AbstractJsonDataType;
+import io.roach.data.json.support.LocalDateDeserializer;
+import io.roach.data.json.support.LocalDateSerializer;
 
 @Entity
 @Table(name = "transaction")
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionItem.java b/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionItem.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.util.UUID;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionJournal.java b/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionJournal.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionJournalRepository.java b/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionJournalRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionRepository.java b/roach-data-json/src/main/java/io/roach/data/json/journal/TransactionRepository.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.util.UUID;
 
diff --git a/roach-data-json/src/main/java/io/roach/data/json/support/AbstractJsonDataType.java b/roach-data-json/src/main/java/io/roach/data/json/support/AbstractJsonDataType.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.support;
+package io.roach.data.json.support;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/support/LocalDateDeserializer.java b/roach-data-json/src/main/java/io/roach/data/json/support/LocalDateDeserializer.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.support;
+package io.roach.data.json.support;
 
 import java.io.IOException;
 import java.time.LocalDate;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/support/LocalDateSerializer.java b/roach-data-json/src/main/java/io/roach/data/json/support/LocalDateSerializer.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.support;
+package io.roach.data.json.support;
 
 import java.io.IOException;
 import java.time.LocalDate;
diff --git a/roach-data-json/src/main/java/io/roach/data/json/support/SchemaExporter.java b/roach-data-json/src/main/java/io/roach/data/json/support/SchemaExporter.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.support;
+package io.roach.data.json.support;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,11 +17,11 @@
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 
-import io.roach.data.jpa.journal.Account;
-import io.roach.data.jpa.journal.AccountJournal;
-import io.roach.data.jpa.journal.Transaction;
-import io.roach.data.jpa.journal.TransactionItem;
-import io.roach.data.jpa.journal.TransactionJournal;
+import io.roach.data.json.journal.Account;
+import io.roach.data.json.journal.AccountJournal;
+import io.roach.data.json.journal.Transaction;
+import io.roach.data.json.journal.TransactionItem;
+import io.roach.data.json.journal.TransactionJournal;
 
 public class SchemaExporter {
     public static Class[] ENTITY_TYPES = {
diff --git a/roach-data-json/src/main/resources/application.yml b/roach-data-json/src/main/resources/application.yml
diff --git a/roach-data-json/src/main/resources/banner.txt b/roach-data-json/src/main/resources/banner.txt
diff --git a/roach-data-json/src/main/resources/db/changelog-master.xml b/roach-data-json/src/main/resources/db/changelog-master.xml
diff --git a/roach-data-json/src/main/resources/db/create.sql b/roach-data-json/src/main/resources/db/create.sql
diff --git a/roach-data-json/src/main/resources/logback.xml b/roach-data-json/src/main/resources/logback.xml
diff --git a/roach-data-json/src/test/java/io/roach/data/json/AbstractIntegrationTest.java b/roach-data-json/src/test/java/io/roach/data/json/AbstractIntegrationTest.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
diff --git a/roach-data-json/src/test/java/io/roach/data/json/JacksonConfig.java b/roach-data-json/src/test/java/io/roach/data/json/JacksonConfig.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa;
+package io.roach.data.json;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/roach-data-json/src/test/java/io/roach/data/json/chat/ChatHistoryRepositoryTest.java b/roach-data-json/src/test/java/io/roach/data/json/chat/ChatHistoryRepositoryTest.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.chat;
+package io.roach.data.json.chat;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import io.roach.data.jpa.AbstractIntegrationTest;
+import io.roach.data.json.AbstractIntegrationTest;
 
 public class ChatHistoryRepositoryTest extends AbstractIntegrationTest {
     @Autowired
diff --git a/roach-data-json/src/test/java/io/roach/data/json/department/DepartmentRepositoryTest.java b/roach-data-json/src/test/java/io/roach/data/json/department/DepartmentRepositoryTest.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.department;
+package io.roach.data.json.department;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -17,7 +17,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import io.roach.data.jpa.AbstractIntegrationTest;
+import io.roach.data.json.AbstractIntegrationTest;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/roach-data-json/src/test/java/io/roach/data/json/journal/AccountJournalTest.java b/roach-data-json/src/test/java/io/roach/data/json/journal/AccountJournalTest.java
@@ -1,4 +1,4 @@
-package io.roach.data.jpa.journal;
+package io.roach.data.json.journal;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -10,7 +10,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import io.roach.data.jpa.AbstractIntegrationTest;
+import io.roach.data.json.AbstractIntegrationTest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/roach-data-json/src/test/java/io/roach/data/json/journal/AccountRepositoryTest.java b/roach-data-json/src/test/java/io/roach/data/json/journal/AccountRepositoryTest.java
diff --git a/roach-data-json/src/test/java/io/roach/data/json/journal/ObjectMapperFormatTest.java b/roach-data-json/src/test/java/io/roach/data/json/journal/ObjectMapperFormatTest.java
diff --git a/roach-data-json/src/test/java/io/roach/data/json/journal/TransactionJournalTest.java b/roach-data-json/src/test/java/io/roach/data/json/journal/TransactionJournalTest.java
diff --git a/roach-data-json/src/test/java/io/roach/data/json/journal/TransactionRepositoryTest.java b/roach-data-json/src/test/java/io/roach/data/json/journal/TransactionRepositoryTest.java
diff --git a/roach-data-json/src/test/resources/application.yml b/roach-data-json/src/test/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.roach.data.jpa;`
	`1`	`+package io.roach.data.json;`
`2`	`2`
`3`	`3`	`import java.math.BigDecimal;`
`4`	`4`