Polish up chapter 8 code

gregturn · gregturn · commit 5582c5ed8ca8 · 2017-08-21T23:09:18.000-05:00
diff --git a/8/part1/chat/build.gradle b/8/part1/chat/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java b/8/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java
@@ -1,10 +1,12 @@
 package com.greglturnquist.learningspringboot.chat;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 // tag::code[]
-@SpringCloudApplication
+@SpringBootApplication
+@EnableEurekaClient
 public class LearningSpringBootChatApplication {
 
 	public static void main(String[] args) {
diff --git a/8/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java b/8/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java
@@ -40,10 +40,12 @@ HandlerMapping webSocketMapping(CommentService commentService) {
 		Map<String, WebSocketHandler> urlMap = new HashMap<>();
 		urlMap.put("/topic/comments.new", commentService);
 
-		Map<String, CorsConfiguration> corsConfigurationMap = new HashMap<>();
+		Map<String, CorsConfiguration> corsConfigurationMap =
+			new HashMap<>();
 		CorsConfiguration corsConfiguration = new CorsConfiguration();
 		corsConfiguration.addAllowedOrigin("http://localhost:8080");
-		corsConfigurationMap.put("/topic/comments.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/topic/comments.new", corsConfiguration);
 
 		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
 		mapping.setOrder(10);
diff --git a/8/part1/comments/build.gradle b/8/part1/comments/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part1/config-server/build.gradle b/8/part1/config-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part1/eureka-server/build.gradle b/8/part1/eureka-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part1/images/build.gradle b/8/part1/images/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/8/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -71,7 +71,8 @@ public Mono<ResponseEntity<?>> addComment(Mono<Comment> newComment) {
 				.flatMap(comment -> {
 					counterService.increment("comments.total.produced");
 					counterService.increment(
-						"comments." + comment.getImageId() + ".produced");
+						"comments." +
+							comment.getImageId() + ".produced");
 					return Mono.just(ResponseEntity.noContent().build());
 				});
 		} else {
diff --git a/8/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/8/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/8/part2/chat/build.gradle b/8/part2/chat/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part2/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java b/8/part2/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java
@@ -37,19 +37,23 @@ public class WebSocketConfig {
 	// tag::websocket-config[]
 	@Bean
 	HandlerMapping webSocketMapping(CommentService commentService,
-									InboundChatService inboundChatService,
-									OutboundChatService outboundChatService) {
+						InboundChatService inboundChatService,
+						OutboundChatService outboundChatService) {
 		Map<String, WebSocketHandler> urlMap = new HashMap<>();
 		urlMap.put("/topic/comments.new", commentService);
 		urlMap.put("/app/chatMessage.new", inboundChatService);
 		urlMap.put("/topic/chatMessage.new", outboundChatService);
 
-		Map<String, CorsConfiguration> corsConfigurationMap = new HashMap<>();
+		Map<String, CorsConfiguration> corsConfigurationMap =
+			new HashMap<>();
 		CorsConfiguration corsConfiguration = new CorsConfiguration();
 		corsConfiguration.addAllowedOrigin("http://localhost:8080");
-		corsConfigurationMap.put("/topic/comments.new", corsConfiguration);
-		corsConfigurationMap.put("/app/chatMessage.new", corsConfiguration);
-		corsConfigurationMap.put("/topic/chatMessage.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/topic/comments.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/app/chatMessage.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/topic/chatMessage.new", corsConfiguration);
 
 		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
 		mapping.setOrder(10);
diff --git a/8/part2/comments/build.gradle b/8/part2/comments/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part2/config-server/build.gradle b/8/part2/config-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part2/eureka-server/build.gradle b/8/part2/eureka-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part2/images/build.gradle b/8/part2/images/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/8/part2/images/src/main/resources/templates/index.html b/8/part2/images/src/main/resources/templates/index.html
@@ -112,15 +112,16 @@ <h1>Learning Spring Boot - 2nd Edition</h1>
                     }
                     <!-- end::chat-2[] -->
 
-                    <!-- tag::chat-3[] -->
-    				var inboundChatMessages = new WebSocket('ws://localhost:8200/topic/chatMessage.new');
-                    // Listen for new chat messages
-				    inboundChatMessages.onmessage = function(event) {
-                    	console.log('Received ' + event.data);
-                        var chatDisplay = document.getElementById('chatDisplay');
-                        chatDisplay.value = chatDisplay.value + event.data + '\n';
-                    };
-                    <!-- end::chat-3[] -->
+				<!-- tag::chat-3[] -->
+				var inboundChatMessages =
+					new WebSocket('ws://localhost:8200/topic/chatMessage.new');
+				// Listen for new chat messages
+				inboundChatMessages.onmessage = function (event) {
+					console.log('Received ' + event.data);
+					var chatDisplay = document.getElementById('chatDisplay');
+					chatDisplay.value = chatDisplay.value + event.data + '\n';
+				};
+				<!-- end::chat-3[] -->
 
                     document.getElementById('chatInput').focus();
             })();
diff --git a/8/part3/chat/build.gradle b/8/part3/chat/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/InboundChatService.java b/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/InboundChatService.java
@@ -33,19 +33,23 @@ public class InboundChatService extends UserParsingHandshakeHandler {
 
 	private final ChatServiceStreams chatServiceStreams;
 
-	public InboundChatService(ChatServiceStreams chatServiceStreams) {
+	public InboundChatService(ChatServiceStreams chatServiceStreams){
 		this.chatServiceStreams = chatServiceStreams;
 	}
 
 	@Override
 	protected Mono<Void> handleInternal(WebSocketSession session) {
 		return session
 			.receive()
-			.log(getUser(session.getId()) + "-inbound-incoming-chat-message")
+			.log(getUser(session.getId())
+				+ "-inbound-incoming-chat-message")
 			.map(WebSocketMessage::getPayloadAsText)
-			.log(getUser(session.getId()) + "-inbound-convert-to-text")
-			.flatMap(message -> broadcast(message, getUser(session.getId())))
-			.log(getUser(session.getId()) + "-inbound-broadcast-to-broker")
+			.log(getUser(session.getId())
+				+ "-inbound-convert-to-text")
+			.flatMap(message ->
+				broadcast(message, getUser(session.getId())))
+			.log(getUser(session.getId())
+				+ "-inbound-broadcast-to-broker")
 			.then();
 	}
 
diff --git a/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/OutboundChatService.java b/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/OutboundChatService.java
@@ -33,7 +33,8 @@
 // tag::code-1[]
 @Service
 @EnableBinding(ChatServiceStreams.class)
-public class OutboundChatService extends UserParsingHandshakeHandler {
+public class OutboundChatService
+				extends UserParsingHandshakeHandler {
 	//end::code-1[]
 	
 	private final static Logger log =
diff --git a/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/UserParsingHandshakeHandler.java b/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/UserParsingHandshakeHandler.java
@@ -28,7 +28,8 @@
  * @author Greg Turnquist
  */
 // tag::code[]
-abstract class UserParsingHandshakeHandler implements WebSocketHandler {
+abstract class UserParsingHandshakeHandler
+				implements WebSocketHandler {
 	
 	private final Map<String, String> userMap;
 
@@ -40,7 +41,8 @@ abstract class UserParsingHandshakeHandler implements WebSocketHandler {
 	public final Mono<Void> handle(WebSocketSession session) {
 
 		this.userMap.put(session.getId(),
-				Stream.of(session.getHandshakeInfo().getUri().getQuery().split("&"))
+				Stream.of(session.getHandshakeInfo().getUri()
+							.getQuery().split("&"))
 					.map(s -> s.split("="))
 					.filter(strings -> strings[0].equals("user"))
 					.findFirst()
@@ -50,7 +52,8 @@ public final Mono<Void> handle(WebSocketSession session) {
 		return handleInternal(session);
 	}
 
-	abstract protected Mono<Void> handleInternal(WebSocketSession session);
+	abstract protected Mono<Void> handleInternal(
+							WebSocketSession session);
 
 	String getUser(String id) {
 		return userMap.get(id);
diff --git a/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java b/8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java
@@ -36,19 +36,23 @@ public class WebSocketConfig {
 
 	@Bean
 	HandlerMapping webSocketMapping(CommentService commentService,
-									InboundChatService inboundChatService,
-									OutboundChatService outboundChatService) {
+						InboundChatService inboundChatService,
+						OutboundChatService outboundChatService) {
 		Map<String, WebSocketHandler> urlMap = new HashMap<>();
 		urlMap.put("/topic/comments.new", commentService);
 		urlMap.put("/app/chatMessage.new", inboundChatService);
 		urlMap.put("/topic/chatMessage.new", outboundChatService);
 
-		Map<String, CorsConfiguration> corsConfigurationMap = new HashMap<>();
+		Map<String, CorsConfiguration> corsConfigurationMap =
+			new HashMap<>();
 		CorsConfiguration corsConfiguration = new CorsConfiguration();
 		corsConfiguration.addAllowedOrigin("http://localhost:8080");
-		corsConfigurationMap.put("/topic/comments.new", corsConfiguration);
-		corsConfigurationMap.put("/app/chatMessage.new", corsConfiguration);
-		corsConfigurationMap.put("/topic/chatMessage.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/topic/comments.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/app/chatMessage.new", corsConfiguration);
+		corsConfigurationMap.put(
+			"/topic/chatMessage.new", corsConfiguration);
 
 		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
 		mapping.setOrder(10);
diff --git a/8/part3/comments/build.gradle b/8/part3/comments/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part3/config-server/build.gradle b/8/part3/config-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part3/eureka-server/build.gradle b/8/part3/eureka-server/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part3/images/build.gradle b/8/part3/images/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
 	repositories {
diff --git a/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/8/part3/images/src/main/resources/templates/index.html b/8/part3/images/src/main/resources/templates/index.html
@@ -94,7 +94,8 @@ <h1>Learning Spring Boot - 2nd Edition</h1>
                 document.getElementById('connect')
                     .addEventListener('click', function () {
                         document.getElementById('connect').style.display = 'none';
-                        document.getElementById('disconnect').style.display = 'inline';
+                        document.getElementById('disconnect').style.display =
+                                                                        'inline';
 
                         var usernameInput = document.getElementById('username');
 
@@ -130,9 +131,12 @@ <h1>Learning Spring Boot - 2nd Edition</h1>
                         }
 
                         // tag::chat[]
-                        inboundChatMessages = new WebSocket('ws://localhost:8200/topic/chatMessage.new?user='
-                            + usernameInput.value);
+                        inboundChatMessages =
+                            new WebSocket(
+                            	'ws://localhost:8200/topic/chatMessage.new?user='
+                                + usernameInput.value);
                         inboundChatMessages.onmessage = function (event) {
+                        	console.log('Received ' + event.data);
                             var chatDisplay = document.getElementById('chatDisplay');
                             chatDisplay.value = chatDisplay.value + event.data + '\n';
                         };

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- springBootVersion = '2.0.0.BUILD-SNAPSHOT'`
	`3`	`+ springBootVersion = '2.0.0.M3'`
`4`	`4`	`springCloudVersion = 'Finchley.BUILD-SNAPSHOT'`
`5`	`5`	`}`
`6`	`6`	`repositories {`