Autowire datasource and add profile based configuration

Author: andrebrowne

build.gradle

@@ -16,6 +16,15 @@ dependencies {
     // https://mvnrepository.com/artifact/mysql/mysql-connector-java
     compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.12'
 
+    // To use Spring Cloud Connectors for development
+    compile 'org.springframework.cloud:spring-cloud-localconfig-connector'
+
+    // If you intend to deploy the app to Cloud Foundry
+    compile 'org.springframework.cloud:spring-cloud-cloudfoundry-connector'
+    compile 'org.springframework.cloud:spring-cloud-spring-service-connector'
+
+    compile "org.springframework.boot:spring-boot-configuration-processor"
+
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }
 
@@ -40,4 +49,7 @@ flyway {
 
 task testMigrate(type: org.flywaydb.gradle.task.FlywayMigrateTask) {
     url = testDbUrl
-}
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8

manifest.yml

@@ -7,5 +7,8 @@ applications:
   disk_quota: 256M
   buildpacks:
     - java_buildpack
+  services:
+    - tracker-database
   env:
-    WELCOME_MESSAGE: Hello from the review environment
+    MANAGEMENT_SECURITY_ENABLED: false
+    WELCOME_MESSAGE: Hello from the review environment

src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java

@@ -21,10 +21,11 @@ public static void main(String[] args) {
         SpringApplication.run(PalTrackerApplication.class, args);
     }
 
+    @Autowired
+    DataSource dataSource;
+
     @Bean
-    TimeEntryRepository timeEntryRepository(@Value("${SPRING_DATASOURCE_URL}") String dataSourceUrl) {
-        DataSource dataSource = new MysqlDataSource();
-        ((MysqlDataSource) dataSource).setUrl(dataSourceUrl);
+    TimeEntryRepository timeEntryRepository() {
         return new JdbcTimeEntryRepository(dataSource);
     }
 

src/main/java/io/pivotal/pal/tracker/PalTrackerConfig.java

@@ -0,0 +1,44 @@
+package io.pivotal.pal.tracker;
+
+import com.mysql.cj.jdbc.MysqlDataSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.cloud.config.java.*;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@ServiceScan
+public class PalTrackerConfig {
+    @Configuration
+    @Profile("cloud")
+    static class CloudConfiguration extends AbstractCloudConfig {
+
+        @Bean
+        public DataSource dataSource() {
+            return connectionFactory().dataSource();
+        }
+
+        @Bean
+        public Properties cloudProperties() {
+            return properties();
+        }
+    }
+
+    @Configuration
+    @Profile("default")
+    static class LocalConfiguration {
+        @Bean
+        public DataSource dataSource() {
+            MysqlDataSource dataSource = new MysqlDataSource();
+            dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL"));
+            return dataSource;
+        }
+        @Bean
+        public Properties cloudProperties() {
+            return new Properties();
+        }
+
+    }
+}

src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java

@@ -17,6 +17,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.sql.DataSource;
 import java.time.LocalDate;
 import java.util.Collection;
 import java.util.TimeZone;
@@ -32,12 +33,15 @@ public class TimeEntryApiTest {
     @Autowired
     private TestRestTemplate restTemplate;
 
+    @Autowired
+    DataSource dataSource;
+
     private TimeEntry timeEntry = new TimeEntry(123L, 456L, LocalDate.parse("2017-01-08"), 8);
 
     @Before
     public void setUp() throws Exception {
-        MysqlDataSource dataSource = new MysqlDataSource();
-        dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL"));
+        //MysqlDataSource dataSource = new MysqlDataSource();
+        //dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL"));
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         jdbcTemplate.execute("TRUNCATE time_entries");