-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #79 from HappyScrolls/feature
fix: 코드 수정
- Loading branch information
Showing
19 changed files
with
310 additions
and
176 deletions.
There are no files selected for viewing
144 changes: 72 additions & 72 deletions
144
src/main/java/com/HappyScrolls/config/DatabaseConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,72 @@ | ||
| package com.HappyScrolls.config; | ||
|
|
||
| import com.zaxxer.hikari.HikariDataSource; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.boot.autoconfigure.EnableAutoConfiguration; | ||
| import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; | ||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
| import org.springframework.boot.jdbc.DataSourceBuilder; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Primary; | ||
| import org.springframework.data.jpa.repository.config.EnableJpaRepositories; | ||
| import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy; | ||
| import org.springframework.transaction.annotation.EnableTransactionManagement; | ||
|
|
||
| import javax.sql.DataSource; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static com.HappyScrolls.config.ReplicationRoutingDataSource.DATASOURCE_SOURCE_KEY; | ||
|
|
||
|
|
||
| @Configuration | ||
| @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class}) | ||
| @EnableTransactionManagement | ||
| @EnableConfigurationProperties(Replicas.class) | ||
| @EnableJpaRepositories(basePackages = {"com.HappyScrolls"}) | ||
| public class DatabaseConfig { | ||
|
|
||
| private final Replicas replicas; | ||
|
|
||
| public DatabaseConfig(Replicas replicas) { | ||
| this.replicas = replicas; | ||
| } | ||
|
|
||
| @Bean | ||
| @ConfigurationProperties(prefix = "spring.datasource.hikari.source") | ||
| public DataSource sourceDataSource() { | ||
| return DataSourceBuilder.create().type(HikariDataSource.class).build(); | ||
| } | ||
|
|
||
| @Bean | ||
| public Map<String, DataSource> replicaDataSources() { | ||
| return replicas.replicaDataSources(HikariDataSource.class); | ||
| } | ||
|
|
||
| @Bean | ||
| public DataSource routingDataSource(@Qualifier("sourceDataSource") DataSource source, | ||
| @Qualifier("replicaDataSources") Map<String, DataSource> replicas) { | ||
| ReplicationRoutingDataSource routingDataSource = new ReplicationRoutingDataSource(); | ||
|
|
||
| Map<Object, Object> dataSources = new HashMap<>(); | ||
| dataSources.put(DATASOURCE_SOURCE_KEY, source); | ||
| dataSources.putAll(replicas); | ||
|
|
||
| routingDataSource.setTargetDataSources(dataSources); | ||
| routingDataSource.setDefaultTargetDataSource(source); | ||
| List<String> replicaDataSourceNames = new ArrayList<>(replicas.keySet()); | ||
| routingDataSource.setReplicaDataSourceNames(replicaDataSourceNames); | ||
|
|
||
| return routingDataSource; | ||
| } | ||
|
|
||
| @Primary | ||
| @Bean | ||
| public DataSource dataSource(@Qualifier("routingDataSource") DataSource routingDataSource) { | ||
| return new LazyConnectionDataSourceProxy(routingDataSource); | ||
| } | ||
| } | ||
| //package com.HappyScrolls.config; | ||
| // | ||
| //import com.zaxxer.hikari.HikariDataSource; | ||
| //import org.springframework.beans.factory.annotation.Qualifier; | ||
| //import org.springframework.boot.autoconfigure.EnableAutoConfiguration; | ||
| //import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; | ||
| //import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| //import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
| //import org.springframework.boot.jdbc.DataSourceBuilder; | ||
| //import org.springframework.context.annotation.Bean; | ||
| //import org.springframework.context.annotation.Configuration; | ||
| //import org.springframework.context.annotation.Primary; | ||
| //import org.springframework.data.jpa.repository.config.EnableJpaRepositories; | ||
| //import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy; | ||
| //import org.springframework.transaction.annotation.EnableTransactionManagement; | ||
| // | ||
| //import javax.sql.DataSource; | ||
| //import java.util.ArrayList; | ||
| //import java.util.HashMap; | ||
| //import java.util.List; | ||
| //import java.util.Map; | ||
| // | ||
| //import static com.HappyScrolls.config.ReplicationRoutingDataSource.DATASOURCE_SOURCE_KEY; | ||
| // | ||
| // | ||
| //@Configuration | ||
| //@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class}) | ||
| //@EnableTransactionManagement | ||
| //@EnableConfigurationProperties(Replicas.class) | ||
| //@EnableJpaRepositories(basePackages = {"com.HappyScrolls"}) | ||
| //public class DatabaseConfig { | ||
| // | ||
| // private final Replicas replicas; | ||
| // | ||
| // public DatabaseConfig(Replicas replicas) { | ||
| // this.replicas = replicas; | ||
| // } | ||
| // | ||
| // @Bean | ||
| // @ConfigurationProperties(prefix = "spring.datasource.hikari.source") | ||
| // public DataSource sourceDataSource() { | ||
| // return DataSourceBuilder.create().type(HikariDataSource.class).build(); | ||
| // } | ||
| // | ||
| // @Bean | ||
| // public Map<String, DataSource> replicaDataSources() { | ||
| // return replicas.replicaDataSources(HikariDataSource.class); | ||
| // } | ||
| // | ||
| // @Bean | ||
| // public DataSource routingDataSource(@Qualifier("sourceDataSource") DataSource source, | ||
| // @Qualifier("replicaDataSources") Map<String, DataSource> replicas) { | ||
| // ReplicationRoutingDataSource routingDataSource = new ReplicationRoutingDataSource(); | ||
| // | ||
| // Map<Object, Object> dataSources = new HashMap<>(); | ||
| // dataSources.put(DATASOURCE_SOURCE_KEY, source); | ||
| // dataSources.putAll(replicas); | ||
| // | ||
| // routingDataSource.setTargetDataSources(dataSources); | ||
| // routingDataSource.setDefaultTargetDataSource(source); | ||
| // List<String> replicaDataSourceNames = new ArrayList<>(replicas.keySet()); | ||
| // routingDataSource.setReplicaDataSourceNames(replicaDataSourceNames); | ||
| // | ||
| // return routingDataSource; | ||
| // } | ||
| // | ||
| // @Primary | ||
| // @Bean | ||
| // public DataSource dataSource(@Qualifier("routingDataSource") DataSource routingDataSource) { | ||
| // return new LazyConnectionDataSourceProxy(routingDataSource); | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 48 additions & 48 deletions
96
src/main/java/com/HappyScrolls/config/ReplicationRoutingDataSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,48 @@ | ||
| package com.HappyScrolls.config; | ||
|
|
||
| import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; | ||
| import org.springframework.transaction.support.TransactionSynchronizationManager; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class ReplicationRoutingDataSource extends AbstractRoutingDataSource { | ||
|
|
||
| public static final String DATASOURCE_SOURCE_KEY = "source"; | ||
|
|
||
| private ReplicaDataSourceNames replicaDataSourceNames; | ||
|
|
||
| public void setReplicaDataSourceNames(List<String> names) { | ||
| this.replicaDataSourceNames = new ReplicaDataSourceNames(names); | ||
| } | ||
|
|
||
| @Override | ||
| protected Object determineCurrentLookupKey() { | ||
| final boolean isReadOnly = TransactionSynchronizationManager.isCurrentTransactionReadOnly(); | ||
| if (isReadOnly) { | ||
| String nextReplicaDataSourceName = replicaDataSourceNames.getNextName(); | ||
| System.out.print("Using Replica DB Name : "); | ||
| System.out.println(nextReplicaDataSourceName); | ||
|
|
||
| return nextReplicaDataSourceName; | ||
| } | ||
| System.out.println("Using Source DB"); | ||
| return DATASOURCE_SOURCE_KEY; | ||
| } | ||
|
|
||
| public static class ReplicaDataSourceNames { | ||
|
|
||
| private final List<String> values; | ||
| private int counter = 0; | ||
|
|
||
| public ReplicaDataSourceNames(List<String> values) { | ||
| this.values = values; | ||
| } | ||
|
|
||
| public String getNextName() { | ||
| if (counter == values.size()) { | ||
| counter = 0; | ||
| } | ||
| return values.get(counter++); | ||
| } | ||
| } | ||
| } | ||
| //package com.HappyScrolls.config; | ||
| // | ||
| //import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; | ||
| //import org.springframework.transaction.support.TransactionSynchronizationManager; | ||
| // | ||
| //import java.util.List; | ||
| // | ||
| //public class ReplicationRoutingDataSource extends AbstractRoutingDataSource { | ||
| // | ||
| // public static final String DATASOURCE_SOURCE_KEY = "source"; | ||
| // | ||
| // private ReplicaDataSourceNames replicaDataSourceNames; | ||
| // | ||
| // public void setReplicaDataSourceNames(List<String> names) { | ||
| // this.replicaDataSourceNames = new ReplicaDataSourceNames(names); | ||
| // } | ||
| // | ||
| // @Override | ||
| // protected Object determineCurrentLookupKey() { | ||
| // final boolean isReadOnly = TransactionSynchronizationManager.isCurrentTransactionReadOnly(); | ||
| // if (isReadOnly) { | ||
| // String nextReplicaDataSourceName = replicaDataSourceNames.getNextName(); | ||
| // System.out.print("Using Replica DB Name : "); | ||
| // System.out.println(nextReplicaDataSourceName); | ||
| // | ||
| // return nextReplicaDataSourceName; | ||
| // } | ||
| // System.out.println("Using Source DB"); | ||
| // return DATASOURCE_SOURCE_KEY; | ||
| // } | ||
| // | ||
| // public static class ReplicaDataSourceNames { | ||
| // | ||
| // private final List<String> values; | ||
| // private int counter = 0; | ||
| // | ||
| // public ReplicaDataSourceNames(List<String> values) { | ||
| // this.values = values; | ||
| // } | ||
| // | ||
| // public String getNextName() { | ||
| // if (counter == values.size()) { | ||
| // counter = 0; | ||
| // } | ||
| // return values.get(counter++); | ||
| // } | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.