Align with Boot 2.0.0.M4

Author: gregturn

1/part1/build.gradle

@@ -1,7 +1,7 @@
 // tag::buildscript[]
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M4'
 	}
 	repositories {
 		mavenCentral()
@@ -38,6 +38,8 @@ repositories {
 	maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
+ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
+
 // tag::deps[]
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')

10/part1/chat/build.gradle

@@ -1,8 +1,9 @@
 // tag::propdeps-plugin-1[]
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M4'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
+		springCloudStreamVersion = 'Elmhurst.M1'
 	}
 	repositories {
 		mavenCentral()
@@ -57,8 +58,11 @@ configurations {
 	all*.exclude group: 'org.springframework', module: 'spring-webmvc'
 }
 
+ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
+
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-webflux')
+	compile('org.synchronoss.cloud:nio-multipart-parser:1.1.0')
 	compile('org.springframework.boot:spring-boot-starter-actuator')
 	compile("org.springframework.boot:spring-boot-starter-thymeleaf")
 	compile('org.springframework.boot:spring-boot-devtools')
@@ -69,24 +73,15 @@ dependencies {
 	compile('org.springframework.cloud:spring-cloud-starter-hystrix')
 	compile('org.springframework.cloud:spring-cloud-starter-config')
 
-	compile('org.webjars:requirejs:2.2.0')
-	compile('org.webjars.npm:stompjs:2.3.3') {
-		exclude module: 'websocket' // We are using SockJS for websocket functionality
-	}
-	compile('org.webjars.bower:sockjs-client:1.1.0')
-
+	compile('org.springframework.security:spring-security-config')
 	compile('org.springframework.security:spring-security-webflux')
 
-	compile('org.springframework.session:spring-session-data-mongodb:2.0.0.BUILD-SNAPSHOT')
+	compile('org.springframework.session:spring-session-data-mongodb:2.0.0.M3')
 
 	// tag::zuul[]
 	compile('org.springframework.cloud:spring-cloud-starter-gateway')
 	// end::zuul[]
 
-	// tag::thymeleaf-security[]
-	compile('org.thymeleaf.extras:thymeleaf-extras-springsecurity4:2.1.3.RELEASE')
-	// end::thymeleaf-security[]
-
 	// tag::configuration-processor[]
 	optional "org.springframework.boot:spring-boot-configuration-processor"
 	// end::configuration-processor[]
@@ -101,5 +96,6 @@ compileJava.dependsOn(processResources)
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+		mavenBom "org.springframework.cloud:spring-cloud-stream-dependencies:${springCloudStreamVersion}"
 	}
 }

10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/AuthorizedWebSocketHandler.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 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 com.greglturnquist.learningspringboot.chat;
+
+import java.security.Principal;
+
+import reactor.core.publisher.Mono;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.WebSocketSession;
+
+/**
+ * @author Greg Turnquist
+ */
+// tag::code[]
+abstract class AuthorizedWebSocketHandler
+				implements WebSocketHandler {
+	
+	@Override
+	public final Mono<Void> handle(WebSocketSession session) {
+		return session.getHandshakeInfo().getPrincipal()
+			.filter(this::isAuthorized)
+			.then(doHandle(session));
+	}
+
+	private boolean isAuthorized(Principal principal) {
+		Authentication authentication = (Authentication) principal;
+		return authentication.isAuthenticated() &&
+			authentication.getAuthorities().contains("ROLE_USER");
+	}
+	
+	abstract protected Mono<Void> doHandle(
+							WebSocketSession session);
+}
+// end::code[]

10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/ChatServiceStreams.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 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 com.greglturnquist.learningspringboot.chat;
+
+import org.springframework.cloud.stream.annotation.Input;
+import org.springframework.cloud.stream.annotation.Output;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.SubscribableChannel;
+
+/**
+ * @author Greg Turnquist
+ */
+// tag::code[]
+public interface ChatServiceStreams {
+
+	String NEW_COMMENTS = "newComments";
+	String CLIENT_TO_BROKER = "clientToBroker";
+	String BROKER_TO_CLIENT = "brokerToClient";
+
+	String USER_HEADER = "User";
+
+	@Input(NEW_COMMENTS)
+	SubscribableChannel newComments();
+
+	@Output(CLIENT_TO_BROKER)
+	MessageChannel clientToBroker();
+
+	@Input(BROKER_TO_CLIENT)
+	SubscribableChannel brokerToClient();
+}
+// end::code[]

10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/CommentService.java

@@ -17,33 +17,64 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.FluxSink;
+import reactor.core.publisher.Mono;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.cloud.stream.messaging.Sink;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.socket.WebSocketSession;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * @author Greg Turnquist
  */
 // tag::code[]
 @Service
-@EnableBinding(Sink.class)
-public class CommentService {
+@EnableBinding(ChatServiceStreams.class)
+public class CommentService extends AuthorizedWebSocketHandler {
 
-	private final static Logger log = LoggerFactory.getLogger(CommentService.class);
+	private final static Logger log =
+		LoggerFactory.getLogger(CommentService.class);
 
-	private final SimpMessagingTemplate simpMessagingTemplate;
+	private ObjectMapper mapper;
+	private Flux<Comment> flux;
+	private FluxSink<Comment> webSocketCommentSink;
 
-	public CommentService(SimpMessagingTemplate simpMessagingTemplate) {
-		this.simpMessagingTemplate = simpMessagingTemplate;
+	CommentService(ObjectMapper mapper) {
+		this.mapper = mapper;
+		this.flux = Flux.<Comment>create(
+			emitter -> this.webSocketCommentSink = emitter,
+			FluxSink.OverflowStrategy.IGNORE)
+			.publish()
+			.autoConnect();
 	}
 
-	@StreamListener(Sink.INPUT)
+	@StreamListener(ChatServiceStreams.NEW_COMMENTS)
 	public void broadcast(Comment comment) {
-		log.info("Publishing " + comment.toString() + " to websocket...");
-		simpMessagingTemplate.convertAndSend("/topic/comments.new", comment);
+		if (webSocketCommentSink != null) {
+			log.info("Publishing " + comment.toString() +
+				" to websocket...");
+			webSocketCommentSink.next(comment);
+		}
 	}
 
+	@Override
+	public Mono<Void> doHandle(WebSocketSession session) {
+		return session.send(this.flux
+			.map(comment -> {
+				try {
+					return mapper.writeValueAsString(comment);
+				} catch (JsonProcessingException e) {
+					throw new RuntimeException(e);
+				}
+			})
+			.log("encode-as-json")
+			.map(session::textMessage)
+			.log("wrap-as-websocket-message"))
+			.log("publish-to-websocket");
+	}
 }
 // end::code[]

10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/GatewayConfig.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 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 com.greglturnquist.learningspringboot.chat;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.cloud.gateway.filter.factory.WebFilterFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.tuple.Tuple;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebSession;
+
+/**
+ * @author Greg Turnquist
+ */
+// tag::code[]
+@Configuration
+public class GatewayConfig {
+
+	private static final Logger log =
+		LoggerFactory.getLogger(GatewayConfig.class);
+
+	/**
+	 * Force the current WebSession to get saved
+	 */
+	static class SaveSessionWebFilterFactory
+								implements WebFilterFactory {
+		@Override
+		public WebFilter apply(Tuple args) {
+			return (exchange, chain) -> exchange.getSession()
+				.map(webSession -> {
+					log.debug("Session id: " + webSession.getId());
+					webSession.getAttributes().entrySet()
+						.forEach(entry ->
+						log.debug(entry.getKey() + " => " +
+											entry.getValue()));
+					return webSession;
+				})
+				.map(WebSession::save)
+				.then(chain.filter(exchange));
+		}
+	}
+
+	@Bean
+	SaveSessionWebFilterFactory saveSessionWebFilterFactory() {
+		return new SaveSessionWebFilterFactory();
+	}
+}
+// end::code[]

10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/HomeController.java

@@ -15,7 +15,10 @@
  */
 package com.greglturnquist.learningspringboot.chat;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
@@ -24,9 +27,12 @@
 @Controller
 public class HomeController {
 
+	// tag::code[]
 	@GetMapping("/")
-	public String index() {
+	public String index(@AuthenticationPrincipal Authentication auth, Model model) {
+		model.addAttribute("authentication", auth);
 		return "index";
 	}
+	// end::code[]
 
 }