From 7d52c8717359fc68d08091af6365e66e1f3d6143 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Wed, 7 Jun 2017 22:43:52 +0200 Subject: [PATCH] Improve Spring Boot based samples Starting with 2.0.0.M1, Boot provides auto-config support for Lettuce. See gh-790 --- ...ring-session-sample-boot-redis-json.gradle | 1 - .../java/sample/config/SessionConfig.java | 6 ---- ...pring-session-sample-boot-websocket.gradle | 1 - .../java/sample/config/DataSourceConfig.java | 31 ------------------- 4 files changed, 39 deletions(-) delete mode 100644 samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java diff --git a/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle b/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle index 8754cbbe..a56faeb3 100644 --- a/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle +++ b/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle @@ -3,7 +3,6 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { compile(project(':spring-session-data-redis')) { exclude module: 'jedis' - exclude module: 'commons-pool2' } compile "org.springframework.boot:spring-boot-starter-web" compile "org.springframework.boot:spring-boot-starter-thymeleaf" diff --git a/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java b/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java index 68ff742f..f1dec14e 100644 --- a/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java +++ b/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java @@ -20,7 +20,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.security.jackson2.SecurityJackson2Modules; @@ -38,11 +37,6 @@ public class SessionConfig implements BeanClassLoaderAware { return new GenericJackson2JsonRedisSerializer(objectMapper()); } - @Bean - public LettuceConnectionFactory connectionFactory() { - return new LettuceConnectionFactory(); - } - /** * Customized {@link ObjectMapper} to add mix-in for class that doesn't have default * constructors diff --git a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle index 24801c99..3ea6baa3 100644 --- a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle +++ b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle @@ -3,7 +3,6 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { compile(project(':spring-session-data-redis')) { exclude module: 'jedis' - exclude module: 'commons-pool2' } compile "org.springframework.boot:spring-boot-starter-web" compile "org.springframework.boot:spring-boot-starter-thymeleaf" diff --git a/samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java b/samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java deleted file mode 100644 index 3f248aa8..00000000 --- a/samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2014-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package sample.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; - -@Configuration -public class DataSourceConfig { - - @Bean - public LettuceConnectionFactory connectionFactory() { - return new LettuceConnectionFactory(); - } - -}