Support Boot 2.0

build.gradle

 buildscript {
     ext {
-        springBootVersion = '1.5.4.RELEASE'
-        springCloudConnectorsVersion = '1.2.4.RELEASE'
+        springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+        springCloudConnectorsVersion = '2.0.0.BUILD-SNAPSHOT'
     }
 
     repositories {
         jcenter()
         mavenCentral()
         maven { url "https://repo.spring.io/plugins-release" }
+        maven { url "https://repo.spring.io/plugins-snapshot" }
     }
 
     dependencies {
@@ -21,6 +22,7 @@ apply plugin: 'eclipse-wtp'
 apply plugin: 'idea'
 
 apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 
 version = '1.0'
 
@@ -29,6 +31,8 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    mavenLocal()
+    maven { url "https://repo.spring.io/libs-snapshot" }
 }
 
 dependencies {
@@ -45,7 +49,7 @@ dependencies {
     compile "org.springframework.cloud:spring-cloud-cloudfoundry-connector:${springCloudConnectorsVersion}"
 
     // JPA Persistence
-    compile "commons-dbcp:commons-dbcp"
+    compile "org.apache.commons:commons-dbcp2"
     runtime "com.h2database:h2"
     runtime "mysql:mysql-connector-java"
     runtime "org.postgresql:postgresql"

manifest.yml

@@ -3,5 +3,5 @@ applications:
 - name: spring-music
   memory: 1G
   random-route: true
-  path: build/libs/spring-music.jar
+  path: build/libs/spring-music-1.0.jar
 

src/main/java/org/cloudfoundry/samples/music/Application.java

 package org.cloudfoundry.samples.music;
 
 import org.cloudfoundry.samples.music.config.SpringApplicationContextInitializer;
+import org.cloudfoundry.samples.music.repositories.AlbumRepositoryPopulator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application extends SpringBootServletInitializer {
+public class Application {
 
     public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).
-                initializers(new SpringApplicationContextInitializer())
+        new SpringApplicationBuilder(Application.class)
+                .initializers(new SpringApplicationContextInitializer())
+                .listeners(new AlbumRepositoryPopulator())
                 .application()
                 .run(args);
     }
-}
+}
\ No newline at end of file

src/main/java/org/cloudfoundry/samples/music/config/SpringApplicationContextInitializer.java

@@ -17,6 +17,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.StringUtils;
 
+import javax.validation.constraints.NotNull;
 import java.util.*;
 
 public class SpringApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -26,7 +27,7 @@ public class SpringApplicationContextInitializer implements ApplicationContextIn
     private static final Map<Class<? extends ServiceInfo>, String> serviceTypeToProfileName = new HashMap<>();
     private static final List<String> validLocalProfiles = Arrays.asList("mysql", "postgres", "mongodb", "redis");
 
-    public static final String IN_MEMORY_PROFILE = "in-memory";
+    private static final String IN_MEMORY_PROFILE = "in-memory";
 
     static {
         serviceTypeToProfileName.put(MongoServiceInfo.class, "mongodb");
@@ -56,7 +57,7 @@ public class SpringApplicationContextInitializer implements ApplicationContextIn
         }
     }
 
-    public String[] getCloudProfile(Cloud cloud) {
+    private String[] getCloudProfile(Cloud cloud) {
         if (cloud == null) {
             return null;
         }

src/main/java/org/cloudfoundry/samples/music/config/data/AbstractLocalDataSourceConfig.java

 package org.cloudfoundry.samples.music.config.data;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 import javax.sql.DataSource;
 

src/main/java/org/cloudfoundry/samples/music/domain/RandomIdGenerator.java

 package org.cloudfoundry.samples.music.domain;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.IdentifierGenerator;
 
 import java.io.Serializable;
@@ -9,7 +9,7 @@ import java.util.UUID;
 
 public class RandomIdGenerator implements IdentifierGenerator {
     @Override
-    public Serializable generate(SessionImplementor session, Object object) throws HibernateException {
+    public Serializable generate(SharedSessionContractImplementor session, Object object) throws HibernateException {
         return generateId();
     }
 

src/main/java/org/cloudfoundry/samples/music/repositories/AlbumRepositoryPopulator.java

@@ -3,27 +3,20 @@ package org.cloudfoundry.samples.music.repositories;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.cloudfoundry.samples.music.domain.Album;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.init.Jackson2ResourceReader;
-import org.springframework.stereotype.Component;
 
 import java.util.Collection;
 
-@Component
-public class AlbumRepositoryPopulator implements ApplicationListener<ContextRefreshedEvent>, ApplicationContextAware {
+public class AlbumRepositoryPopulator implements ApplicationListener<ApplicationReadyEvent> {
     private final Jackson2ResourceReader resourceReader;
     private final Resource sourceData;
 
-    private ApplicationContext applicationContext;
-
     public AlbumRepositoryPopulator() {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -32,25 +25,17 @@ public class AlbumRepositoryPopulator implements ApplicationListener<ContextRefr
     }
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
-    }
-
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        if (event.getApplicationContext().equals(applicationContext)) {
-            CrudRepository albumRepository =
-                    BeanFactoryUtils.beanOfTypeIncludingAncestors(applicationContext, CrudRepository.class);
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        CrudRepository albumRepository =
+                BeanFactoryUtils.beanOfTypeIncludingAncestors(event.getApplicationContext(), CrudRepository.class);
 
-            if (albumRepository != null && albumRepository.count() == 0) {
-                populate(albumRepository);
-            }
+        if (albumRepository != null && albumRepository.count() == 0) {
+            populate(albumRepository);
         }
-
     }
 
     @SuppressWarnings("unchecked")
-    public void populate(CrudRepository repository) {
+    private void populate(CrudRepository repository) {
         Object entity = getEntityFromResource(sourceData);
 
         if (entity instanceof Collection) {

src/main/java/org/cloudfoundry/samples/music/repositories/redis/RedisAlbumRepository.java

@@ -8,6 +8,7 @@ import org.springframework.data.repository.CrudRepository;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 public class RedisAlbumRepository implements CrudRepository<Album, String> {
@@ -33,7 +34,7 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     }
 
     @Override
-    public <S extends Album> Iterable<S> save(Iterable<S> albums) {
+    public <S extends Album> Iterable<S> saveAll(Iterable<S> albums) {
         List<S> result = new ArrayList<>();
 
         for (S entity : albums) {
@@ -45,12 +46,12 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     }
 
     @Override
-    public Album findOne(String id) {
-        return hashOps.get(ALBUMS_KEY, id);
+    public Optional<Album> findById(String id) {
+        return Optional.of(hashOps.get(ALBUMS_KEY, id));
     }
 
     @Override
-    public boolean exists(String id) {
+    public boolean existsById(String id) {
         return hashOps.hasKey(ALBUMS_KEY, id);
     }
 
@@ -60,7 +61,7 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     }
 
     @Override
-    public Iterable<Album> findAll(Iterable<String> ids) {
+    public Iterable<Album> findAllById(Iterable<String> ids) {
         return hashOps.multiGet(ALBUMS_KEY, convertIterableToList(ids));
     }
 
@@ -70,7 +71,7 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     }
 
     @Override
-    public void delete(String id) {
+    public void deleteById(String id) {
         hashOps.delete(ALBUMS_KEY, id);
     }
 
@@ -80,7 +81,7 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     }
 
     @Override
-    public void delete(Iterable<? extends Album> albums) {
+    public void deleteAll(Iterable<? extends Album> albums) {
         for (Album album : albums) {
             delete(album);
         }
@@ -90,7 +91,7 @@ public class RedisAlbumRepository implements CrudRepository<Album, String> {
     public void deleteAll() {
         Set<String> ids = hashOps.keys(ALBUMS_KEY);
         for (String id : ids) {
-            delete(id);
+            deleteById(id);
         }
     }
 

src/main/java/org/cloudfoundry/samples/music/web/AlbumController.java

@@ -40,12 +40,12 @@ public class AlbumController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public Album getById(@PathVariable String id) {
         logger.info("Getting album " + id);
-        return repository.findOne(id);
+        return repository.findById(id).orElse(null);
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     public void deleteById(@PathVariable String id) {
         logger.info("Deleting album " + id);
-        repository.delete(id);
+        repository.deleteById(id);
     }
 }
\ No newline at end of file

src/main/resources/application.yml

-
----
 spring:
   jpa:
     generate-ddl: true
 
-# turn off the security on the actuator end points as this is a demo app
 management:
-  security:
-    enabled: false
+  endpoints:
+    web:
\ No newline at end of file
+      exposure:
+        include: "*"