Polishing

gregturn · gregturn · commit d111fe7f7631 · 2017-10-15T21:19:14.000-05:00
diff --git a/10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java b/10/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringCloudApplication
@@ -11,5 +13,10 @@ public static void main(String[] args) {
 		SpringApplication.run(
 			LearningSpringBootChatApplication.class, args);
 	}
+
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
 // end::code[]
diff --git a/10/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/10/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -53,7 +53,7 @@ public Flux<Comment> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.saveAll(newComment)
 			.map(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return comment;
 			});
diff --git a/10/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/10/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -69,7 +69,7 @@ public Mono<ResponseEntity<?>> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just(ResponseEntity.noContent().build());
 				});
diff --git a/5/part1/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java b/5/part1/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 @SpringBootApplication
 public class LearningSpringBootApplication {
@@ -10,4 +12,8 @@ public static void main(String[] args) {
 		SpringApplication.run(LearningSpringBootApplication.class, args);
 	}
 
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
diff --git a/5/part2/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java b/5/part2/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 @SpringBootApplication
 public class LearningSpringBootApplication {
@@ -10,4 +12,9 @@ public static void main(String[] args) {
 		SpringApplication.run(LearningSpringBootApplication.class, args);
 	}
 
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
+
 }
diff --git a/6/part1/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java b/6/part1/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 @SpringBootApplication
 public class LearningSpringBootApplication {
@@ -10,4 +12,8 @@ public static void main(String[] args) {
 		SpringApplication.run(LearningSpringBootApplication.class, args);
 	}
 
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
diff --git a/6/part2/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java b/6/part2/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 @SpringBootApplication
 public class LearningSpringBootApplication {
@@ -10,4 +12,8 @@ public static void main(String[] args) {
 		SpringApplication.run(LearningSpringBootApplication.class, args);
 	}
 
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
diff --git a/6/part2/src/main/java/com/greglturnquist/learningspringboot/comments/CommentController.java b/6/part2/src/main/java/com/greglturnquist/learningspringboot/comments/CommentController.java
@@ -51,7 +51,7 @@ public Mono<String> addComment(Mono<Comment> newComment) {
 			.log("commentService-publish")
 			.flatMap(comment -> {
 				meterRegistry
-					.counter("comments.produced", comment.getImageId())
+					.counter("comments.produced", "imageId", comment.getImageId())
 					.increment();
 				return Mono.just("redirect:/");
 			});
diff --git a/6/part2/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/6/part2/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -53,7 +53,7 @@ public void save(Comment newComment) {
 			.log("commentService-save")
 			.subscribe(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 			});
 	}
diff --git a/6/part3/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java b/6/part3/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootApplication.java
@@ -5,6 +5,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringBootApplication
@@ -14,6 +15,11 @@ public static void main(String[] args) {
 		SpringApplication.run(LearningSpringBootApplication.class, args);
 	}
 
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
+
 	@Bean
 	ParameterMessageInterpolator parameterMessageInterpolator() {
 		return new ParameterMessageInterpolator();
diff --git a/6/part3/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/6/part3/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -32,7 +32,7 @@
  */
 // tag::stream-1[]
 @Service
-@EnableBinding(Processor.class)
+@EnableBinding(CustomProcessor.class)
 public class CommentService {
 	// end::stream-1[]
 
@@ -48,14 +48,14 @@ public CommentService(CommentWriterRepository repository,
 
 	// tag::stream-2[]
 	@StreamListener
-	@Output(Processor.OUTPUT)
-	public Flux<Void> save(@Input(Processor.INPUT)
+	@Output(CustomProcessor.OUTPUT)
+	public Flux<Void> save(@Input(CustomProcessor.INPUT)
 						   Flux<Comment> newComments) {
 		return repository
 			.saveAll(newComments)
 			.flatMap(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return Mono.empty();
 			});
diff --git a/6/part3/src/main/java/com/greglturnquist/learningspringboot/comments/CustomProcessor.java b/6/part3/src/main/java/com/greglturnquist/learningspringboot/comments/CustomProcessor.java
@@ -0,0 +1,39 @@
+/*
+ * 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.comments;
+
+import org.springframework.cloud.stream.annotation.Input;
+import org.springframework.cloud.stream.annotation.Output;
+import org.springframework.cloud.stream.annotation.Input;
+import org.springframework.messaging.SubscribableChannel;
+import org.springframework.cloud.stream.annotation.Output;
+import org.springframework.messaging.MessageChannel;
+
+/**
+ * @author Greg Turnquist
+ */
+public interface CustomProcessor {
+
+	String INPUT = "input";
+	String OUTPUT = "emptyOutput";
+
+	@Input(CustomProcessor.INPUT)
+	SubscribableChannel input();
+
+	@Output(CustomProcessor.OUTPUT)
+	MessageChannel output();
+
+}
diff --git a/7/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/7/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -54,7 +54,7 @@ public Flux<Void> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.saveAll(newComment)
 			.flatMap(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return Mono.empty();
 			});
diff --git a/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java b/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringCloudApplication
@@ -11,5 +13,11 @@ public static void main(String[] args) {
 		SpringApplication.run(
 			LearningSpringBootImagesApplication.class, args);
 	}
+
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
+
 }
 // end::code[]
diff --git a/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -67,7 +67,7 @@ public Mono<String> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just("redirect:/");
 				});
diff --git a/7/part2/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/7/part2/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -54,7 +54,7 @@ public Flux<Void> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.saveAll(newComment)
 			.flatMap(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return Mono.empty();
 			});
diff --git a/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java b/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringCloudApplication
@@ -11,5 +13,10 @@ public static void main(String[] args) {
 		SpringApplication.run(
 			LearningSpringBootImagesApplication.class, args);
 	}
+
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
 // end::code[]
diff --git a/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -66,7 +66,7 @@ public Mono<String> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just("redirect:/");
 				});
diff --git a/7/part3/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/7/part3/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -54,7 +54,7 @@ public Flux<Void> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.saveAll(newComment)
 			.flatMap(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return Mono.empty();
 			});
diff --git a/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java b/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringCloudApplication
@@ -11,5 +13,11 @@ public static void main(String[] args) {
 		SpringApplication.run(
 			LearningSpringBootImagesApplication.class, args);
 	}
+
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
+
 }
 // end::code[]
diff --git a/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -66,7 +66,7 @@ public Mono<String> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just("redirect:/");
 				});
diff --git a/8/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/8/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -58,7 +58,7 @@ public Flux<Comment> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.map(comment -> {
 				log.info("Saving new comment " + comment);
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return comment;
 			});
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
@@ -69,7 +69,7 @@ public Mono<ResponseEntity<?>> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just(ResponseEntity.noContent().build());
 				});
diff --git a/8/part2/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/8/part2/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
@@ -53,7 +53,7 @@ public Flux<Comment> save(@Input(Processor.INPUT) Flux<Comment> newComment) {
 			.saveAll(newComment)
 			.map(comment -> {
 				meterRegistry
-					.counter("comments.consumed", comment.getImageId())
+					.counter("comments.consumed", "imageId", comment.getImageId())
 					.increment();
 				return comment;
 			});
diff --git a/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java b/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
 // tag::code[]
 @SpringCloudApplication
@@ -11,5 +13,10 @@ public static void main(String[] args) {
 		SpringApplication.run(
 			LearningSpringBootImagesApplication.class, args);
 	}
+
+	@Bean
+	HiddenHttpMethodFilter hiddenHttpMethodFilter() {
+		return new HiddenHttpMethodFilter();
+	}
 }
 // end::code[]
diff --git a/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/8/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
@@ -66,7 +66,7 @@ public Mono<ResponseEntity<?>> addComment(Mono<Comment> newComment) {
 				})
 				.flatMap(comment -> {
 					meterRegistry
-						.counter("comments.produced", comment.getImageId())
+						.counter("comments.produced", "imageId", comment.getImageId())
 						.increment();
 					return Mono.just(ResponseEntity.noContent().build());
 				});
diff --git a/8/part3/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/8/part3/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
diff --git a/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java b/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/LearningSpringBootImagesApplication.java
diff --git a/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/8/part3/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java
diff --git a/9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/GatewayConfig.java b/9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/GatewayConfig.java
diff --git a/9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java b/9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/LearningSpringBootChatApplication.java
diff --git a/9/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java b/9/part1/comments/src/main/java/com/greglturnquist/learningspringboot/comments/CommentService.java
diff --git a/9/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java b/9/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentController.java

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
	`5`	`+import org.springframework.context.annotation.Bean;`
	`6`	`+import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;`
`5`	`7`
`6`	`8`	`@SpringBootApplication`
`7`	`9`	`public class LearningSpringBootApplication {`
`@@ -10,4 +12,8 @@ public static void main(String[] args) {`
`10`	`12`	`SpringApplication.run(LearningSpringBootApplication.class, args);`
`11`	`13`	`}`
`12`	`14`
	`15`	`+ @Bean`
	`16`	`+ HiddenHttpMethodFilter hiddenHttpMethodFilter() {`
	`17`	`+ return new HiddenHttpMethodFilter();`
	`18`	`+ }`
`13`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void save(Comment newComment) {`
`53`	`53`	`.log("commentService-save")`
`54`	`54`	`.subscribe(comment -> {`
`55`	`55`	`meterRegistry`
`56`		`- .counter("comments.consumed", comment.getImageId())`
	`56`	`+ .counter("comments.consumed", "imageId", comment.getImageId())`
`57`	`57`	`.increment();`
`58`	`58`	`});`
`59`	`59`	`}`