mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Downgrade Spring Boot to 1.5.3.RELEASE

Browse Source 
Fixes gh-710
This commit is contained in:
Vedran Pavic
2017-04-28 17:27:49 +02:00
parent 63b836b212
commit 2ebbe762f0
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,3 +1,3 @@
version=2.0.0.BUILD-SNAPSHOT
springBootVersion=2.0.0.BUILD-SNAPSHOT
springIoVersion=Cairo-BUILD-SNAPSHOT
springBootVersion=1.5.3.RELEASE
springIoVersion=Cairo-BUILD-SNAPSHOT

3
gradle/dependency-management.properties
View File

@@ -1,3 +1,4 @@
biz.paluch.redis\:lettuce=4.3.1.Final
com.maxmind.geoip2\:geoip2=2.3.1
edu.umd.cs.mtc\:multithreadedtc=1.01
org.springframework.shell\:spring-shell=1.1.0.RELEASE
@@ -6,4 +7,4 @@ org.webjars\:html5shiv=3.7.3
org.webjars\:knockout=2.3.0
org.webjars\:sockjs-client=0.3.4
org.webjars\:stomp-websocket=2.3.0
org.webjars\:webjars-taglib=0.3
org.webjars\:webjars-taglib=0.3

4
samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
dependencies {
compile project(':spring-session')
compile"org.springframework.data:spring-data-redis"
compile"io.lettuce:lettuce-core"
compile"biz.paluch.redis:lettuce"
compile"org.springframework.boot:spring-boot-starter-web"
compile"org.springframework.boot:spring-boot-starter-thymeleaf"
compile"org.springframework.boot:spring-boot-starter-security"
@@ -16,4 +16,4 @@ dependencies {
integrationTestCompile seleniumDependencies
}
}

2
samples/boot/redis/spring-session-sample-boot-redis.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
dependencies {
compile project(':spring-session-data-redis')
compile "io.lettuce:lettuce-core"
compile "biz.paluch.redis:lettuce"
compile"org.springframework.boot:spring-boot-starter-security"
compile"org.springframework.boot:spring-boot-starter-thymeleaf"
compile"org.springframework.boot:spring-boot-starter-web"

2
samples/boot/websocket/spring-session-sample-boot-websocket.gradle
View File

@@ -10,7 +10,7 @@ dependencies {
compile"org.springframework.boot:spring-boot-starter-websocket"
compile"org.springframework:spring-websocket"
compile"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
compile"io.lettuce:lettuce-core"
compile"biz.paluch.redis:lettuce"
compile"org.webjars:bootstrap"
compile"org.webjars:html5shiv"
compile"org.webjars:knockout"

9
samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* 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.
@@ -17,7 +17,6 @@
package sample.websocket;
import java.util.Arrays;
import java.util.Optional;
import sample.data.ActiveWebSocketUser;
import sample.data.ActiveWebSocketUserRepository;
@@ -43,14 +42,14 @@ public class WebSocketDisconnectHandler<S>
if (id == null) {
return;
}
Optional<ActiveWebSocketUser> user = this.repository.findOne(id);
if (!user.isPresent()) {
ActiveWebSocketUser user = this.repository.findOne(id);
if (user == null) {
return;
}
this.repository.delete(id);
this.messagingTemplate.convertAndSend("/topic/friends/signout",
Arrays.asList(user.get().getUsername()));
Arrays.asList(user.getUsername()));
}
}