Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to allow DB configuration and scaling #47

Merged
merged 9 commits into from
Jun 13, 2018
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package uk.gov.ons.ctp.response.sample;

import net.sourceforge.cobertura.CoverageIgnore;

import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package uk.gov.ons.ctp.response.sample.config;

import javax.sql.DataSource;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.Cloud;
import org.springframework.cloud.CloudFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;

import net.sourceforge.cobertura.CoverageIgnore;

/**
* DataSource bean
*
*/
@CoverageIgnore
@Configuration
@Profile("cloud")
public class DataSourceConfiguration {

@Bean
public Cloud cloud() {
return new CloudFactory().getCloud();
}

@Bean
@ConfigurationProperties(prefix="spring.datasource.tomcat")
public DataSource dataSource() {
return cloud().getSingletonServiceConnector(DataSource.class, null);
}

}
4 changes: 4 additions & 0 deletions src/main/resources/application-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ spring:
min-idle: 3
continue-on-error: true
schema: classpath:/schema-cloud.sql
user: ${cloud.services.postgresql.connection.username}
password: ${cloud.services.postgresql.connection.password}
default-schema: sample
url: ${cloud.services.postgresql.connection.jdbcurl}

jpa:
database-platform: org.hibernate.dialect.PostgreSQLDialect
Expand Down