From 57e853788d65a080b566f2ca6f3e1b1b488e765e Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Wed, 11 Sep 2024 17:29:36 +1000 Subject: [PATCH] remove profile hikari --- .../properties/database/HikariDataSourceProperties.java | 2 +- .../properties/database/PrimaryHikariDataSourceProperties.java | 2 +- .../properties/database/ReplicaHikariDataSourceProperties.java | 2 +- .../commons/database/config/HikariDataSourceConfiguration.java | 2 +- .../commons/database/config/JPAPersistenceConfiguration.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/HikariDataSourceProperties.java b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/HikariDataSourceProperties.java index 37a5e62..afbc67b 100644 --- a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/HikariDataSourceProperties.java +++ b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/HikariDataSourceProperties.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import java.io.Serializable; import java.util.Properties; -@Profile(value = {"database & hikari"}) +@Profile(value = {"database"}) @EqualsAndHashCode(callSuper = true) @Data public class HikariDataSourceProperties extends HikariConfig implements Serializable { diff --git a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/PrimaryHikariDataSourceProperties.java b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/PrimaryHikariDataSourceProperties.java index 0b922f5..ad50da8 100644 --- a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/PrimaryHikariDataSourceProperties.java +++ b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/PrimaryHikariDataSourceProperties.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Profile; import java.util.Properties; -@Profile(value = {"database & hikari"}) +@Profile(value = {"database"}) @ConfigurationProperties("app.database.primary.datasource.hikari") public class PrimaryHikariDataSourceProperties extends HikariDataSourceProperties { public PrimaryHikariDataSourceProperties() { diff --git a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/ReplicaHikariDataSourceProperties.java b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/ReplicaHikariDataSourceProperties.java index 47435db..bbec3a4 100644 --- a/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/ReplicaHikariDataSourceProperties.java +++ b/configuration/src/main/java/sydney/cheng/microservice/commons/configuration/properties/database/ReplicaHikariDataSourceProperties.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Profile; import java.util.Properties; -@Profile(value = {"database & hikari"}) +@Profile(value = {"database"}) @ConfigurationProperties("app.database.replica.datasource.hikari") public class ReplicaHikariDataSourceProperties extends HikariDataSourceProperties { public ReplicaHikariDataSourceProperties() { diff --git a/database/src/main/java/sydney/cheng/microservice/commons/database/config/HikariDataSourceConfiguration.java b/database/src/main/java/sydney/cheng/microservice/commons/database/config/HikariDataSourceConfiguration.java index e537912..fc64b5e 100644 --- a/database/src/main/java/sydney/cheng/microservice/commons/database/config/HikariDataSourceConfiguration.java +++ b/database/src/main/java/sydney/cheng/microservice/commons/database/config/HikariDataSourceConfiguration.java @@ -15,7 +15,7 @@ import java.util.Map; import static sydney.cheng.microservice.commons.database.constant.DatabaseBeanConstant.*; -@Profile(value = {"database & hikari"}) +@Profile(value = {"database"}) @Getter @Setter @ToString diff --git a/database/src/main/java/sydney/cheng/microservice/commons/database/config/JPAPersistenceConfiguration.java b/database/src/main/java/sydney/cheng/microservice/commons/database/config/JPAPersistenceConfiguration.java index 694365b..1ee33c1 100644 --- a/database/src/main/java/sydney/cheng/microservice/commons/database/config/JPAPersistenceConfiguration.java +++ b/database/src/main/java/sydney/cheng/microservice/commons/database/config/JPAPersistenceConfiguration.java @@ -21,7 +21,7 @@ import java.util.Map; import static sydney.cheng.microservice.commons.database.constant.DatabaseBeanConstant.*; -@Profile(value = {"database & hikari"}) +@Profile(value = {"database"}) @Configuration @EnableJpaRepositories( basePackages = "sydney.cheng.**.repository",