upgraded to Java 11 and fixed build

spring-boot/conditionals/src/test/java/io/reflectoring/conditionals/ConditionalsApplicationTests.java

@@ -1,16 +1,13 @@
 package io.reflectoring.conditionals;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
-public class ConditionalsApplicationTests {
+class ConditionalsApplicationTests {
 
 	@Test
-	public void contextLoads() {
+	void contextLoads() {
 	}
 
 }

spring-boot/configuration/src/main/java/io/reflectoring/configuration/unknownfield/UnkownFieldProperties.java

@@ -1,17 +1,7 @@
 package io.reflectoring.configuration.unknownfield;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import java.time.Duration;
-import java.util.List;
-
-import io.reflectoring.configuration.mail.Weight;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import org.springframework.stereotype.Component;
-import org.springframework.util.unit.DataSize;
-import org.springframework.validation.annotation.Validated;
 
 @Component
 @ConfigurationProperties(prefix = "myapp.unknownfield", ignoreUnknownFields = false)

spring-boot/configuration/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 myapp.mail.enabled=true
-myapp.mail.defaultSubject=hello
+myapp
 myapp.mail.pauseBetweenMails=5s
 myapp.mail.maxAttachmentSize=1MB
 myapp.mail.smtpServers[0]=server1

spring-boot/configuration/src/test/java/io/reflectoring/configuration/ConfigurationApplicationTests.java

@@ -1,16 +0,0 @@
-package io.reflectoring.configuration;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@ExtendWith(SpringExtension.class)
-@SpringBootTest
-class ConfigurationApplicationTests {
-
-  @Test
-  void contextLoads() {
-  }
-
-}

spring-boot/configuration/src/test/java/io/reflectoring/configuration/mail/MailModuleTestWithAllProperties.java

@@ -10,7 +10,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.unit.DataSize;
 import static org.assertj.core.api.Assertions.*;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = {
 		"myapp.mail.enabled=asd",
 		"myapp.mail.defaultSubject=hello",
@@ -22,17 +21,17 @@ import static org.assertj.core.api.Assertions.*;
 })
 class MailModuleTestWithAllProperties {
 
-  @Autowired(required = false)
-  private MailModuleProperties mailModuleProperties;
+	@Autowired(required = false)
+	private MailModuleProperties mailModuleProperties;
 
-  @Test
-  void propertiesAreLoaded() {
-	assertThat(mailModuleProperties).isNotNull();
-	assertThat(mailModuleProperties.getDefaultSubject()).isEqualTo("hello");
-	assertThat(mailModuleProperties.getEnabled()).isTrue();
-	assertThat(mailModuleProperties.getPauseBetweenMails()).isEqualByComparingTo(Duration.ofSeconds(5));
-	assertThat(mailModuleProperties.getMaxAttachmentSize()).isEqualByComparingTo(DataSize.ofMegabytes(1));
-	assertThat(mailModuleProperties.getSmtpServers()).hasSize(2);
-	assertThat(mailModuleProperties.getMaxAttachmentWeight().getGrams()).isEqualTo(5000L);
-  }
+	@Test
+	void propertiesAreLoaded() {
+		assertThat(mailModuleProperties).isNotNull();
+		assertThat(mailModuleProperties.getDefaultSubject()).isEqualTo("hello");
+		assertThat(mailModuleProperties.getEnabled()).isTrue();
+		assertThat(mailModuleProperties.getPauseBetweenMails()).isEqualByComparingTo(Duration.ofSeconds(5));
+		assertThat(mailModuleProperties.getMaxAttachmentSize()).isEqualByComparingTo(DataSize.ofMegabytes(1));
+		assertThat(mailModuleProperties.getSmtpServers()).hasSize(2);
+		assertThat(mailModuleProperties.getMaxAttachmentWeight().getGrams()).isEqualTo(5000L);
+	}
 }

spring-boot/configuration/src/test/java/io/reflectoring/configuration/mail/MailModuleTestWithInvalidProperties.java

@@ -2,24 +2,21 @@ package io.reflectoring.configuration.mail;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import static org.assertj.core.api.Assertions.*;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = {
 		"myapp.mail.defaultSubject="
 })
 @Disabled("this test will fail due to invalid properties")
 class MailModuleTestWithInvalidProperties {
 
-  @Autowired(required = false)
-  private MailModuleProperties mailModuleProperties;
+	@Autowired(required = false)
+	private MailModuleProperties mailModuleProperties;
 
-  @Test
-  void propertiesAreLoaded() {
-	assertThat(mailModuleProperties).isNotNull();
-  }
+	@Test
+	void propertiesAreLoaded() {
+		assertThat(mailModuleProperties).isNotNull();
+	}
 }

spring-boot/configuration/src/test/java/io/reflectoring/configuration/mail/MailModuleTestWithUnknownField.java

@@ -1,22 +0,0 @@
-package io.reflectoring.configuration.mail;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import static org.assertj.core.api.Assertions.*;
-
-@ExtendWith(SpringExtension.class)
-@SpringBootTest
-class MailModuleTestWithUnknownField {
-
-  @Autowired(required = false)
-  private MailModuleProperties mailModuleProperties;
-
-  @Test
-  void propertiesAreLoaded() {
-	assertThat(mailModuleProperties).isNotNull();
-  }
-}

spring-boot/configuration/src/test/java/io/reflectoring/configuration/unknownandinvalidfield/UnkownFieldPropertiesTest.java

@@ -8,7 +8,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import static org.assertj.core.api.Assertions.*;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = {
 		"myapp.unknown-and-invalid-field-module.unknown-property=foo"
 })

spring-boot/configuration/src/test/java/io/reflectoring/configuration/unknownfield/UnkownFieldPropertiesTest.java

@@ -8,7 +8,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import static org.assertj.core.api.Assertions.*;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = {
 		"myapp.unknownfield.unknown-property=foo"
 })

spring-boot/modular/application/build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	mavenLocal()

spring-boot/modular/booking-module/build.gradle

@@ -11,6 +11,10 @@ repositories {
 
 dependencies {
     compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
+    
+    // adding javax.annotation since it's no longer included in Java 11
+    compile("javax.annotation:javax.annotation-api:1.3.2")
+    
     testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
 }
 

spring-boot/pagination/settings.gradle

@@ -1,6 +0,0 @@
-pluginManagement {
-	repositories {
-		gradlePluginPortal()
-	}
-}
-rootProject.name = 'pagination'

spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginationApplication.java

@@ -1,15 +0,0 @@
-package io.reflectoring.pagination;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
-
-@SpringBootApplication
-public class PaginationApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(PaginationApplication.class, args);
-	}
-
-}

spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginationApplicationTests.java

@@ -1,13 +0,0 @@
-package io.reflectoring.pagination;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PaginationApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

spring-boot/paging/src/main/java/io/reflectoring/paging/MovieCharacter.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import lombok.Data;
 

spring-boot/paging/src/main/java/io/reflectoring/paging/MovieCharacterRepository.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import java.util.List;
 

spring-boot/paging/src/main/java/io/reflectoring/paging/PagedController.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-class PaginatedController {
+class PagedController {
 
 	private final MovieCharacterRepository characterRepository;
 
@@ -25,7 +25,8 @@ class PaginatedController {
 			@SortDefault.SortDefaults({
 					@SortDefault(sort = "name", direction = Sort.Direction.DESC),
 					@SortDefault(sort = "id", direction = Sort.Direction.ASC)
-			}) Pageable pageable) {
+			})
+		Pageable pageable) {
 		return characterRepository.findAllPage(pageable);
 	}
 

spring-boot/paging/src/main/java/io/reflectoring/paging/PagingApplication.java

@@ -0,0 +1,13 @@
+package io.reflectoring.paging;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PagingApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(PagingApplication.class, args);
+	}
+
+}

spring-boot/paging/src/main/resources/application.properties

@@ -2,5 +2,6 @@ spring.data.web.pageable.size-parameter=size
 spring.data.web.pageable.page-parameter=page
 spring.data.web.pageable.default-page-size=10
 spring.data.web.pageable.one-indexed-parameters=false
-spring.data.web.pageable.prefix=2000
+spring.data.web.pageable.max-page-size=2000
+spring.data.web.pageable.prefix=
 spring.data.web.pageable.qualifier-delimiter=_

spring-boot/paging/src/test/java/io/reflectoring/paging/MovieCharacterRepositoryTest.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

spring-boot/paging/src/test/java/io/reflectoring/paging/PageableAssert.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import java.util.Objects;
 

spring-boot/paging/src/test/java/io/reflectoring/paging/PagedControllerTest.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -10,19 +10,19 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static io.reflectoring.pagination.PageableAssert.*;
-import static io.reflectoring.pagination.SortAssert.*;
+import static io.reflectoring.paging.PageableAssert.*;
+import static io.reflectoring.paging.SortAssert.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 @WebMvcTest(
-		controllers = PaginatedController.class
+		controllers = PagedController.class
 		// If we exclude SpringDataWebAutoConfiguration, the Pageable parameter will not be resolved.
 		// If we only exclude it on the Application class itself, the test will still work!!!
 		// excludeAutoConfiguration = SpringDataWebAutoConfiguration.class
 )
-class PaginatedControllerTest {
+class PagedControllerTest {
 
 	@MockBean
 	private MovieCharacterRepository characterRepository;

spring-boot/paging/src/test/java/io/reflectoring/paging/PagedControllerWithCustomPagingPropertiesTest.java

@@ -1,29 +1,27 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
-import static io.reflectoring.pagination.PageableAssert.*;
+import static io.reflectoring.paging.PageableAssert.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
-@WebMvcTest(controllers = PaginatedController.class)
+@WebMvcTest(controllers = PagedController.class)
 @TestPropertySource(properties = {
 		"spring.data.web.pageable.prefix=prefix_",
 		"spring.data.web.pageable.size-parameter=my-size",
 		"spring.data.web.pageable.page-parameter=my-page"
 })
-class PaginatedControllerWithCustomPagingPropertiesTest {
+class PagedControllerWithCustomPagingPropertiesTest {
 
 	@MockBean
 	private MovieCharacterRepository characterRepository;

spring-boot/paging/src/test/java/io/reflectoring/paging/SortAssert.java

@@ -1,4 +1,4 @@
-package io.reflectoring.pagination;
+package io.reflectoring.paging;
 
 import org.assertj.core.api.AbstractAssert;
 import org.springframework.data.domain.Sort;

spring-boot/rabbitmq-event-brokering/build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	mavenLocal()

spring-boot/spring-boot-logging/build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'io.reflectoring'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	mavenCentral()

spring-boot/spring-boot-testing/build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'reflectoring.io'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	jcenter()

spring-boot/spring-boot-testing/src/main/java/io/reflectoring/customer/data/Customer.java

@@ -18,8 +18,5 @@ public class Customer {
 	@GeneratedValue
 	private Long id;
 
-	@Version
-	private Long version;
-
 	private String name;
 }

spring-boot/spring-boot-testing/src/test/java/io/reflectoring/booking/web/BookingControllerTest.java

@@ -9,7 +9,9 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +23,8 @@ import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@WebMvcTest(controllers = BookingController.class)
+@SpringBootTest
+@AutoConfigureMockMvc
 class BookingControllerTest {
 
   @Autowired

spring-boot/validation/build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'io.spring.dependency-management'
 
 group = 'io.reflectoring'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	mavenCentral()