Polish code for chapter 7

gregturn · gregturn · commit 95262fbadf61 · 2017-08-13T20:38:56.000-05:00
diff --git a/10/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/10/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.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/10/part1/images/src/main/resources/templates/index.html b/10/part1/images/src/main/resources/templates/index.html
@@ -14,7 +14,7 @@ <h4 th:text="${page.size} + ' item(s) per page'" />
         </tr>
         </thead>
         <tbody>
-        <tr th:each="image : ${page.content}">
+        <tr th:each="image : ${images}">
             <td th:text="${image.id}" />
             <td th:text="${image.name}" />
             <td><a th:href="@{'/images/' + ${image.name} + '/raw'}"><img th:src="@{'/images/' + ${image.name} + '/raw'}" class="thumbnail" /></a></td>
diff --git a/5/part2/src/main/java/com/greglturnquist/learningspringboot/CustomMetrics.java b/5/part2/src/main/java/com/greglturnquist/learningspringboot/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot;
 
-import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/6/part1/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/6/part1/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/6/part2/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java b/6/part2/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java
@@ -15,13 +15,15 @@
  */
 package com.greglturnquist.learningspringboot;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import reactor.core.publisher.Mono;
-
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import com.greglturnquist.learningspringboot.comments.Comment;
 import com.greglturnquist.learningspringboot.comments.CommentController;
@@ -47,19 +49,23 @@ public CommentSimulator(CommentController controller,
 		this.counter = new AtomicInteger(1);
 	}
 
-	@Scheduled(fixedRate = 100)
-	public void simulateActivity() {
-		repository
-			.findAll()
+	@EventListener
+	public void onApplicationReadyEvent(ApplicationReadyEvent event) {
+		Flux
+			.interval(Duration.ofMillis(1000))
+			.flatMap(tick -> repository.findAll())
 			.map(image -> {
 				Comment comment = new Comment();
 				comment.setImageId(image.getId());
 				comment.setComment(
 					"Comment #" + counter.getAndIncrement());
 				return Mono.just(comment);
 			})
-			.map(controller::addComment)
+			.flatMap(newComment ->
+				Mono.defer(() ->
+					controller.addComment(newComment)))
 			.subscribe();
 	}
+
 }
 // end::tag[]
diff --git a/6/part2/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/6/part2/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/6/part3/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java b/6/part3/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java
@@ -15,13 +15,15 @@
  */
 package com.greglturnquist.learningspringboot;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import reactor.core.publisher.Mono;
-
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import com.greglturnquist.learningspringboot.comments.Comment;
 import com.greglturnquist.learningspringboot.comments.CommentController;
@@ -47,19 +49,23 @@ public CommentSimulator(CommentController controller,
 		this.counter = new AtomicInteger(1);
 	}
 
-	@Scheduled(fixedRate = 100)
-	public void simulateActivity() {
-		repository
-			.findAll()
+	@EventListener
+	public void onApplicationReadyEvent(ApplicationReadyEvent event) {
+		Flux
+			.interval(Duration.ofMillis(1000))
+			.flatMap(tick -> repository.findAll())
 			.map(image -> {
 				Comment comment = new Comment();
 				comment.setImageId(image.getId());
 				comment.setComment(
 					"Comment #" + counter.getAndIncrement());
 				return Mono.just(comment);
 			})
-			.map(controller::addComment)
+			.flatMap(newComment ->
+				Mono.defer(() ->
+					controller.addComment(newComment)))
 			.subscribe();
 	}
+
 }
 // end::tag[]
diff --git a/6/part3/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/6/part3/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
@@ -15,7 +15,7 @@
  */
 package com.greglturnquist.learningspringboot.ops;
 
-import org.springframework.boot.actuate.autoconfigure.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/7/part1/eureka-server/build.gradle b/7/part1/eureka-server/build.gradle
@@ -1,8 +1,10 @@
+// tag::version[]
 buildscript {
 	ext {
 		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
+	// end::version[]
 	repositories {
 		mavenCentral()
 		maven { url "https://repo.spring.io/snapshot" }
diff --git a/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java b/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java
@@ -15,13 +15,15 @@
  */
 package com.greglturnquist.learningspringboot;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import reactor.core.publisher.Mono;
-
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import com.greglturnquist.learningspringboot.images.Comment;
 import com.greglturnquist.learningspringboot.images.CommentController;
@@ -47,19 +49,23 @@ public CommentSimulator(CommentController controller,
 		this.counter = new AtomicInteger(1);
 	}
 
-	@Scheduled(fixedRate = 100)
-	public void simulateActivity() {
-		repository
-			.findAll()
+	@EventListener
+	public void simulateComments(ApplicationReadyEvent event) {
+		Flux
+			.interval(Duration.ofMillis(1000))
+			.flatMap(tick -> repository.findAll())
 			.map(image -> {
 				Comment comment = new Comment();
 				comment.setImageId(image.getId());
 				comment.setComment(
 					"Comment #" + counter.getAndIncrement());
 				return Mono.just(comment);
 			})
-			.map(controller::addComment)
+			.flatMap(newComment ->
+				Mono.defer(() ->
+					controller.addComment(newComment)))
 			.subscribe();
 	}
+
 }
 // end::tag[]
diff --git a/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/HomeController.java b/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/HomeController.java
@@ -56,8 +56,8 @@ public Mono<String> index(Model model) {
 				.map(image -> new HashMap<String, Object>() {{
 					put("id", image.getId());
 					put("name", image.getName());
-					// tag::comments[]
 					put("comments",
+						// tag::comments[]
 						restTemplate.exchange(
 							"http://COMMENTS/comments/{imageId}",
 							HttpMethod.GET,
diff --git a/7/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/7/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.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/7/part2/hystrix-dashboard/build.gradle b/7/part2/hystrix-dashboard/build.gradle
@@ -1,8 +1,10 @@
+// tag::versions[]
 buildscript {
 	ext {
 		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
+	// end::versions[]
 	repositories {
 		mavenCentral()
 		maven { url "https://repo.spring.io/snapshot" }
diff --git a/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java b/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java
@@ -15,14 +15,16 @@
  */
 package com.greglturnquist.learningspringboot;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import reactor.core.publisher.Mono;
-
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.support.BindingAwareModelMap;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import com.greglturnquist.learningspringboot.images.Comment;
 import com.greglturnquist.learningspringboot.images.CommentController;
@@ -51,25 +53,32 @@ public CommentSimulator(HomeController homeController,
 		this.counter = new AtomicInteger(1);
 	}
 
-	@Scheduled(fixedRate = 100)
-	public void simulateActivity() {
-		repository
-			.findAll()
+	@EventListener
+	public void simulateComments(ApplicationReadyEvent event) {
+		Flux
+			.interval(Duration.ofMillis(1000))
+			.flatMap(tick -> repository.findAll())
 			.map(image -> {
 				Comment comment = new Comment();
 				comment.setImageId(image.getId());
 				comment.setComment(
 					"Comment #" + counter.getAndIncrement());
 				return Mono.just(comment);
 			})
-			.map(commentController::addComment)
+			.flatMap(newComment ->
+				Mono.defer(() ->
+					commentController.addComment(newComment)))
 			.subscribe();
 	}
 
-	@Scheduled(fixedRate = 500)
-	public void simulateUsersClicking() {
-		homeController.index(
-			new BindingAwareModelMap());
+	@EventListener
+	public void simulateUsersClicking(ApplicationReadyEvent event) {
+		Flux
+			.interval(Duration.ofMillis(500))
+			.flatMap(tick ->
+				Mono.defer(() ->
+					homeController.index(new BindingAwareModelMap())))
+			.subscribe();
 	}
 }
 // end::tag[]
diff --git a/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentHelper.java b/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/CommentHelper.java
@@ -15,14 +15,15 @@
  */
 package com.greglturnquist.learningspringboot.images;
 
-import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import java.util.Collections;
+import java.util.List;
+
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Collections;
-import java.util.List;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 
 /**
  * @author Greg Turnquist
@@ -45,9 +46,9 @@ public List<Comment> getComments(Image image) {
 			"http://COMMENTS/comments/{imageId}",
 			HttpMethod.GET,
 			null,
-			new ParameterizedTypeReference<List<Comment>>() {
-			},
+			new ParameterizedTypeReference<List<Comment>>() {},
 			image.getId()).getBody();
+
 	}
 	// end::get-comments[]
 
diff --git a/7/part2/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/7/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.ExportMetricReader;
+import org.springframework.boot.actuate.autoconfigure.metrics.ExportMetricReader;
 import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
diff --git a/7/part2/images/src/main/resources/templates/index.html b/7/part2/images/src/main/resources/templates/index.html
@@ -17,7 +17,7 @@ <h1>Learning Spring Boot - 2nd Edition</h1>
                 </tr>
                 </thead>
                 <tbody>
-                <tr th:each="image : ${page.content}">
+                <tr th:each="image : ${images}">
                     <td th:text="${image.id}" />
                     <td th:text="${image.name}" />
                     <td><a th:href="@{'/images/' + ${image.name} + '/raw'}"><img th:src="@{'/images/' + ${image.name} + '/raw'}" class="thumbnail" /></a></td>
diff --git a/7/part3/config-server/build.gradle b/7/part3/config-server/build.gradle
@@ -1,8 +1,10 @@
+// tag::versions[]
 buildscript {
 	ext {
 		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
 	}
+	// end::versions[]
 	repositories {
 		mavenCentral()
 		maven { url "https://repo.spring.io/snapshot" }
diff --git a/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java b/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/CommentSimulator.java
diff --git a/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/7/part3/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
diff --git a/7/part3/images/src/main/resources/templates/index.html b/7/part3/images/src/main/resources/templates/index.html
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
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
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
diff --git a/9/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java b/9/part1/images/src/main/java/com/greglturnquist/learningspringboot/ops/CustomMetrics.java
diff --git a/9/part1/images/src/main/resources/templates/index.html b/9/part1/images/src/main/resources/templates/index.html
