I'm too lazy to put in a comment

gyanks · Mar 19, 2018 · 2d315d9 · 2d315d9
1 parent c84266c
commit 2d315d9
Show file tree

Hide file tree

Showing 90 changed files with 483 additions and 2,310 deletions.
diff --git a/01.framework-introductions/.DS_Store b/01.framework-introductions/.DS_Store
diff --git a/01.framework-introductions/jpa-in-10-steps/jpa-in-10-steps-all-code.md b/01.framework-introductions/jpa-in-10-steps/jpa-in-10-steps-all-code.md
@@ -56,7 +56,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/jpa-in-10-steps/pom.xml b/01.framework-introductions/jpa-in-10-steps/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/jpa-in-10-steps/readme.md b/01.framework-introductions/jpa-in-10-steps/readme.md
@@ -75,7 +75,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/jpa-in-10-steps/step21.md b/01.framework-introductions/jpa-in-10-steps/step21.md
@@ -68,7 +68,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -451,7 +451,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/jpa-in-10-steps/step22.md b/01.framework-introductions/jpa-in-10-steps/step22.md
@@ -68,7 +68,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/jpa-in-10-steps/step23.md b/01.framework-introductions/jpa-in-10-steps/step23.md
@@ -59,7 +59,7 @@ JpaBaseConfiguration#transactionManager matched:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/springboot-in-10-steps/pom.xml b/01.framework-introductions/springboot-in-10-steps/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/01.framework-introductions/springboot-in-10-steps/readme.md b/01.framework-introductions/springboot-in-10-steps/readme.md
@@ -63,7 +63,7 @@ http://localhost:8080/books => Few hardcoded books
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -250,7 +250,7 @@ public class SpringbootIn10StepsApplication {
 
 ```properties
 #logging.level.org.springframework = DEBUG
-management.security.enabled=false
+management.endpoints.web.exposure.include=*
 ```
 ---
 

diff --git a/02.restful-web-services/backup01-after-creating-project.md b/02.restful-web-services/backup01-after-creating-project.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/02.restful-web-services/backup01-after-creating-project.zip b/02.restful-web-services/backup01-after-creating-project.zip
diff --git a/02.restful-web-services/backup02-after-hello-world-path-param.md b/02.restful-web-services/backup02-after-hello-world-path-param.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

diff --git a/02.restful-web-services/backup02-after-hello-world-path-param.zip b/02.restful-web-services/backup02-after-hello-world-path-param.zip
diff --git a/02.restful-web-services/backup03-after-two-retrieve-user-services.md b/02.restful-web-services/backup03-after-two-retrieve-user-services.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -335,6 +335,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup03-after-two-retrieve-user-services.zip b/02.restful-web-services/backup03-after-two-retrieve-user-services.zip
diff --git a/02.restful-web-services/backup04-basic-create-service.md b/02.restful-web-services/backup04-basic-create-service.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -359,6 +359,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup04-basic-create-service.zip b/02.restful-web-services/backup04-basic-create-service.zip
diff --git a/02.restful-web-services/backup05-after-creating-delete-method-on-user-resource.md b/02.restful-web-services/backup05-after-creating-delete-method-on-user-resource.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -480,6 +480,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup05-after-creating-delete-method-on-user-resource.zip b/02.restful-web-services/backup05-after-creating-delete-method-on-user-resource.zip
diff --git a/02.restful-web-services/backup06-after-implementing-validation.md b/02.restful-web-services/backup06-after-implementing-validation.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -496,6 +496,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup06-after-implementing-validation.zip b/02.restful-web-services/backup06-after-implementing-validation.zip
diff --git a/02.restful-web-services/backup06-z-content-negotiation.md b/02.restful-web-services/backup06-z-content-negotiation.md
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -246,6 +246,7 @@ import java.util.Locale;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -275,9 +276,9 @@ public class HelloWorldController {
 	}
 
 	@GetMapping(path = "/hello-world-internationalized")
-	public String helloWorldInternationalized(
-			@RequestHeader(name="Accept-Language", required=false) Locale locale) {
-		return messageSource.getMessage("good.morning.message", null, locale);
+	public String helloWorldInternationalized() {
+		return messageSource.getMessage("good.morning.message", null, 
+									LocaleContextHolder.getLocale());
 	}
 
 }
@@ -294,9 +295,8 @@ import java.util.Locale;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 
 @SpringBootApplication
 public class RestfulWebServicesApplication {
@@ -307,17 +307,10 @@ public class RestfulWebServicesApplication {
 
 	@Bean
 	public LocaleResolver localeResolver() {
-		SessionLocaleResolver localeResolver = new SessionLocaleResolver();
+		AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
 		localeResolver.setDefaultLocale(Locale.US);
 		return localeResolver;
 	}
-
-	@Bean
-	public ResourceBundleMessageSource messageSource() {
-		ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-		messageSource.setBasename("messages");
-		return messageSource;
-	}
 }
 ```
 ---
@@ -559,6 +552,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup06-z-content-negotiation.zip b/02.restful-web-services/backup06-z-content-negotiation.zip
diff --git a/02.restful-web-services/backup07-improving-documentation-with-swagger.md b/02.restful-web-services/backup07-improving-documentation-with-swagger.md
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -257,6 +257,7 @@ import java.util.Locale;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -286,9 +287,9 @@ public class HelloWorldController {
 	}
 
 	@GetMapping(path = "/hello-world-internationalized")
-	public String helloWorldInternationalized(
-			@RequestHeader(name="Accept-Language", required=false) Locale locale) {
-		return messageSource.getMessage("good.morning.message", null, locale);
+	public String helloWorldInternationalized() {
+		return messageSource.getMessage("good.morning.message", null, 
+									LocaleContextHolder.getLocale());
 	}
 
 }
@@ -305,9 +306,8 @@ import java.util.Locale;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 
 @SpringBootApplication
 public class RestfulWebServicesApplication {
@@ -318,17 +318,10 @@ public class RestfulWebServicesApplication {
 
 	@Bean
 	public LocaleResolver localeResolver() {
-		SessionLocaleResolver localeResolver = new SessionLocaleResolver();
+		AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
 		localeResolver.setDefaultLocale(Locale.US);
 		return localeResolver;
 	}
-
-	@Bean
-	public ResourceBundleMessageSource messageSource() {
-		ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-		messageSource.setBasename("messages");
-		return messageSource;
-	}
 }
 ```
 ---
@@ -669,6 +662,7 @@ public interface UserApiDocumentationConfig {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---
@@ -738,7 +732,7 @@ public class RestfulWebServicesApplicationTests {
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -975,6 +969,7 @@ import java.util.Locale;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -1004,9 +999,9 @@ public class HelloWorldController {
 	}
 
 	@GetMapping(path = "/hello-world-internationalized")
-	public String helloWorldInternationalized(
-			@RequestHeader(name="Accept-Language", required=false) Locale locale) {
-		return messageSource.getMessage("good.morning.message", null, locale);
+	public String helloWorldInternationalized() {
+		return messageSource.getMessage("good.morning.message", null, 
+									LocaleContextHolder.getLocale());
 	}
 
 }
@@ -1023,9 +1018,8 @@ import java.util.Locale;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 
 @SpringBootApplication
 public class RestfulWebServicesApplication {
@@ -1036,17 +1030,10 @@ public class RestfulWebServicesApplication {
 
 	@Bean
 	public LocaleResolver localeResolver() {
-		SessionLocaleResolver localeResolver = new SessionLocaleResolver();
+		AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
 		localeResolver.setDefaultLocale(Locale.US);
 		return localeResolver;
 	}
-
-	@Bean
-	public ResourceBundleMessageSource messageSource() {
-		ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
-		messageSource.setBasename("messages");
-		return messageSource;
-	}
 }
 ```
 ---
@@ -1340,6 +1327,7 @@ public class UserResource {
 
 ```properties
 logging.level.org.springframework = info
+#This is not really needed as this is the default after 2.0.0.RELEASE
 spring.jackson.serialization.write-dates-as-timestamps=false
 ```
 ---

diff --git a/02.restful-web-services/backup07-improving-documentation-with-swagger.zip b/02.restful-web-services/backup07-improving-documentation-with-swagger.zip