From 859e4bac776d7b522549c2d4a8b452f5179ce1d6 Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Sun, 10 Apr 2022 08:12:09 +0530 Subject: [PATCH 01/86] BAEL-4886 Flux generate vs create --- .../reactor/creation/CharacterCreator.java | 15 ++++++ .../reactor/creation/CharacterGenerator.java | 18 +++++++ .../reactor/creation/CharacterUnitTest.java | 50 +++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java create mode 100644 reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java create mode 100644 reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java b/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java new file mode 100644 index 0000000000..382615b01c --- /dev/null +++ b/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java @@ -0,0 +1,15 @@ +package com.baeldung.reactor.creation; + +import java.util.List; +import java.util.function.Consumer; + +import reactor.core.publisher.Flux; + +public class CharacterCreator { + + public Consumer> consumer; + + public Flux createCharacterSequence() { + return Flux.create(sink -> CharacterCreator.this.consumer = items -> items.forEach(sink::next)); + } +} diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java b/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java new file mode 100644 index 0000000000..a22ea02bba --- /dev/null +++ b/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java @@ -0,0 +1,18 @@ +package com.baeldung.reactor.creation; + +import reactor.core.publisher.Flux; + +public class CharacterGenerator { + + public Flux generateCharacters() { + + return Flux.generate(() -> 97, (state, sink) -> { + char value = (char) state.intValue(); + sink.next(value); + if (value == 'z') { + sink.complete(); + } + return state + 1; + }); + } +} diff --git a/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java b/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java new file mode 100644 index 0000000000..2609f1f403 --- /dev/null +++ b/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java @@ -0,0 +1,50 @@ +package com.baeldung.reactor.creation; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; + +public class CharacterUnitTest { + + @Test + public void whenGeneratingCharacters_thenCharactersAreProduced() { + CharacterGenerator characterGenerator = new CharacterGenerator(); + Flux characterFlux = characterGenerator.generateCharacters().take(3); + + StepVerifier.create(characterFlux) + .expectNext('a', 'b', 'c') + .expectComplete() + .verify(); + } + + @Test + public void whenCreatingCharactersWithMultipleThreads_thenSequenceIsProducedAsynchronously() throws InterruptedException { + CharacterGenerator characterGenerator = new CharacterGenerator(); + List sequence1 = characterGenerator.generateCharacters().take(3).collectList().block(); + List sequence2 = characterGenerator.generateCharacters().take(2).collectList().block(); + + CharacterCreator characterCreator = new CharacterCreator(); + Thread producingThread1 = new Thread( + () -> characterCreator.consumer.accept(sequence1) + ); + Thread producingThread2 = new Thread( + () -> characterCreator.consumer.accept(sequence2) + ); + + List consolidated = new ArrayList<>(); + characterCreator.createCharacterSequence().subscribe(consolidated::add); + + producingThread1.start(); + producingThread2.start(); + producingThread1.join(); + producingThread2.join(); + + assertThat(consolidated).containsExactlyInAnyOrder('a', 'b', 'c', 'a', 'b'); + } +} From a341bb7c65588b56072ea0ac567b812b06397fdd Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Sat, 16 Apr 2022 07:29:53 +0530 Subject: [PATCH 02/86] PR Review changes --- .../create}/CharacterCreator.java | 3 +-- .../create}/CharacterGenerator.java | 4 +-- .../create}/CharacterUnitTest.java | 26 ++++++++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) rename reactor-core/src/main/java/com/baeldung/reactor/{creation => generate/create}/CharacterCreator.java (88%) rename reactor-core/src/main/java/com/baeldung/reactor/{creation => generate/create}/CharacterGenerator.java (88%) rename reactor-core/src/test/java/com/baeldung/reactor/{creation => generate/create}/CharacterUnitTest.java (76%) diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java similarity index 88% rename from reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java rename to reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java index 382615b01c..122e512e78 100644 --- a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java +++ b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java @@ -1,4 +1,4 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import java.util.List; import java.util.function.Consumer; @@ -6,7 +6,6 @@ import java.util.function.Consumer; import reactor.core.publisher.Flux; public class CharacterCreator { - public Consumer> consumer; public Flux createCharacterSequence() { diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java similarity index 88% rename from reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java rename to reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java index a22ea02bba..7951483dd9 100644 --- a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java +++ b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java @@ -1,11 +1,9 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import reactor.core.publisher.Flux; public class CharacterGenerator { - public Flux generateCharacters() { - return Flux.generate(() -> 97, (state, sink) -> { char value = (char) state.intValue(); sink.next(value); diff --git a/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java similarity index 76% rename from reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java rename to reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java index 2609f1f403..e58ce40b82 100644 --- a/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java +++ b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import static org.assertj.core.api.Assertions.assertThat; @@ -11,7 +11,6 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; public class CharacterUnitTest { - @Test public void whenGeneratingCharacters_thenCharactersAreProduced() { CharacterGenerator characterGenerator = new CharacterGenerator(); @@ -26,24 +25,31 @@ public class CharacterUnitTest { @Test public void whenCreatingCharactersWithMultipleThreads_thenSequenceIsProducedAsynchronously() throws InterruptedException { CharacterGenerator characterGenerator = new CharacterGenerator(); - List sequence1 = characterGenerator.generateCharacters().take(3).collectList().block(); - List sequence2 = characterGenerator.generateCharacters().take(2).collectList().block(); + List sequence1 = characterGenerator.generateCharacters() + .take(3) + .collectList() + .block(); + List sequence2 = characterGenerator.generateCharacters() + .take(2) + .collectList() + .block(); CharacterCreator characterCreator = new CharacterCreator(); - Thread producingThread1 = new Thread( + + Thread producerThread1 = new Thread( () -> characterCreator.consumer.accept(sequence1) ); - Thread producingThread2 = new Thread( + Thread producerThread2 = new Thread( () -> characterCreator.consumer.accept(sequence2) ); List consolidated = new ArrayList<>(); characterCreator.createCharacterSequence().subscribe(consolidated::add); - producingThread1.start(); - producingThread2.start(); - producingThread1.join(); - producingThread2.join(); + producerThread1.start(); + producerThread2.start(); + producerThread1.join(); + producerThread2.join(); assertThat(consolidated).containsExactlyInAnyOrder('a', 'b', 'c', 'a', 'b'); } From a811cb32cfa295e7ac3fa09a2bb774484360958b Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Fri, 22 Apr 2022 19:46:53 +0530 Subject: [PATCH 03/86] Reactor dependency version changes --- reactor-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reactor-core/pom.xml b/reactor-core/pom.xml index 39a66cee3e..e27a1a2845 100644 --- a/reactor-core/pom.xml +++ b/reactor-core/pom.xml @@ -35,7 +35,7 @@ - 3.4.9 + 3.4.17 \ No newline at end of file From 5e1fdd53f0f0d242ee100cb03d2a6f86f0263749 Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:35:49 +0530 Subject: [PATCH 04/86] Removed Trailing whiespaces and corrected the indentation --- .../generate/create/CharacterUnitTest.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java index e58ce40b82..93a65f4006 100644 --- a/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java +++ b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java @@ -17,11 +17,10 @@ public class CharacterUnitTest { Flux characterFlux = characterGenerator.generateCharacters().take(3); StepVerifier.create(characterFlux) - .expectNext('a', 'b', 'c') - .expectComplete() - .verify(); + .expectNext('a', 'b', 'c') + .expectComplete() + .verify(); } - @Test public void whenCreatingCharactersWithMultipleThreads_thenSequenceIsProducedAsynchronously() throws InterruptedException { CharacterGenerator characterGenerator = new CharacterGenerator(); @@ -35,14 +34,10 @@ public class CharacterUnitTest { .block(); CharacterCreator characterCreator = new CharacterCreator(); - Thread producerThread1 = new Thread( - () -> characterCreator.consumer.accept(sequence1) - ); + () -> characterCreator.consumer.accept(sequence1)); Thread producerThread2 = new Thread( - () -> characterCreator.consumer.accept(sequence2) - ); - + () -> characterCreator.consumer.accept(sequence2)); List consolidated = new ArrayList<>(); characterCreator.createCharacterSequence().subscribe(consolidated::add); From 3d98763c50cdd129cbb1c06788e2c52c10c934b7 Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Mon, 25 Apr 2022 10:14:51 +0530 Subject: [PATCH 05/86] Included space between methods --- .../com/baeldung/reactor/generate/create/CharacterUnitTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java index 93a65f4006..6822b25a7f 100644 --- a/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java +++ b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java @@ -21,6 +21,7 @@ public class CharacterUnitTest { .expectComplete() .verify(); } + @Test public void whenCreatingCharactersWithMultipleThreads_thenSequenceIsProducedAsynchronously() throws InterruptedException { CharacterGenerator characterGenerator = new CharacterGenerator(); From 2c79508f5d8d4ff0b70f3dd8ba6f7e26208fb620 Mon Sep 17 00:00:00 2001 From: Mark West <66728126+MWest2020@users.noreply.github.com> Date: Sat, 14 May 2022 14:58:18 +0200 Subject: [PATCH 06/86] Update User.java Remove constants and add empty constructor. Jackson fails otherwise --- .../src/main/java/com/baeldung/javalin/User/User.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries-http/src/main/java/com/baeldung/javalin/User/User.java b/libraries-http/src/main/java/com/baeldung/javalin/User/User.java index 09f710453b..288c027c8b 100644 --- a/libraries-http/src/main/java/com/baeldung/javalin/User/User.java +++ b/libraries-http/src/main/java/com/baeldung/javalin/User/User.java @@ -1,8 +1,11 @@ package com.baeldung.javalin.User; +import com.fasterxml.jackson.annotation.JsonProperty; public class User { - public final int id; - public final String name; + public int id; + public String name; + + public User(){} public User(int id, String name) { this.id = id; From b51605d95432d569bfc91067f627d3c000e88074 Mon Sep 17 00:00:00 2001 From: Daniel Gerigk Date: Thu, 19 May 2022 09:28:25 +0200 Subject: [PATCH 07/86] Update CarServiceSingleton.java --- .../main/java/com/baeldung/singleton/CarServiceSingleton.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java b/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java index 223d139346..0632906b1a 100644 --- a/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java +++ b/jee-7/src/main/java/com/baeldung/singleton/CarServiceSingleton.java @@ -32,7 +32,6 @@ public class CarServiceSingleton { serviceQueue--; LOG.info("Car service for {} is completed - serviceQueue: {}", car, serviceQueue); return serviceQueue; - } private void simulateService(Car car) { From 5127c9aebf1478523f7c8d42c2fa4f89741adeb0 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 1 Jun 2022 16:34:10 +0300 Subject: [PATCH 08/86] Update ConditionalExecutionUnitTest.java --- .../java/com/baeldung/junit5/ConditionalExecutionUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java index 7f76e237f1..b5361ccce6 100644 --- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java +++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java @@ -35,7 +35,7 @@ public class ConditionalExecutionUnitTest { @Test @EnabledIfSystemProperty(named = "os.arch", matches = ".*64.*") - public void whenRunningTestsOn64BitArchitectures_thenTestIsDisabled() { + public void whenRunningTestsOn64BitArchitectures_thenTestIsEnabled() { Integer value = 5; // result of an algorithm assertNotEquals(0, value, "The result cannot be 0"); From be8bed47d3eb4c311b236277aa61b20de1d76845 Mon Sep 17 00:00:00 2001 From: Azhwani Date: Tue, 14 Jun 2022 23:12:55 +0200 Subject: [PATCH 09/86] first commit --- spring-vault/pom.xml | 18 ++++++- .../com/baeldung/springvault/Credentials.java | 5 ++ .../springvault/CredentialsRepository.java | 9 ++++ .../springvault/CredentialsService.java | 14 +++++ .../springvault/VaultIntegrationTest.java | 53 +++++++++++++++++-- 5 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 spring-vault/src/main/java/com/baeldung/springvault/CredentialsRepository.java diff --git a/spring-vault/pom.xml b/spring-vault/pom.xml index 68856de2fc..b0b1590df8 100644 --- a/spring-vault/pom.xml +++ b/spring-vault/pom.xml @@ -15,6 +15,18 @@ 0.0.1-SNAPSHOT ../parent-boot-2 + + + + + org.springframework.data + spring-data-releasetrain + Moore-SR1 + import + pom + + + @@ -26,6 +38,10 @@ spring-vault-core ${spring.vault.core.version} + + org.springframework.data + spring-data-keyvalue + com.fasterxml.jackson.core jackson-databind @@ -38,7 +54,7 @@ - 2.1.1.RELEASE + 2.2.0.RELEASE \ No newline at end of file diff --git a/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java index 548ebd4ff6..a0a9be83a7 100644 --- a/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java +++ b/spring-vault/src/main/java/com/baeldung/springvault/Credentials.java @@ -1,7 +1,12 @@ package com.baeldung.springvault; +import org.springframework.data.annotation.Id; +import org.springframework.vault.repository.mapping.Secret; + +@Secret(backend = "credentials", value = "myapp") public class Credentials { + @Id private String username; private String password; diff --git a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsRepository.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsRepository.java new file mode 100644 index 0000000000..41760114be --- /dev/null +++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.springvault; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CredentialsRepository extends CrudRepository { + +} diff --git a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java index 6a4b7cb784..454819c7ff 100644 --- a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java +++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java @@ -1,6 +1,7 @@ package com.baeldung.springvault; import java.net.URISyntaxException; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,6 +19,9 @@ public class CredentialsService { @Autowired private VaultTemplate vaultTemplate; + + @Autowired + private CredentialsRepository credentialsRepository; /** * To Secure Credentials @@ -40,5 +44,15 @@ public class CredentialsService { VaultResponseSupport response = vaultTemplate.read("credentials/myapp", Credentials.class); return response.getData(); } + + public Credentials saveCredentials(Credentials credentials) { + + return credentialsRepository.save(credentials); + } + + public Optional findById(String username) { + + return credentialsRepository.findById(username); + } } diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java index dd8797aacc..a532eeabbf 100644 --- a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java +++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java @@ -1,23 +1,26 @@ package com.baeldung.springvault; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.net.URISyntaxException; +import java.util.Optional; + import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; +import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import java.net.URISyntaxException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * These tests are requiring the {@code vault} command to be installed and available in the executing * platform. So, if you intend to run them in your environment, the please install the vault and then @@ -32,6 +35,9 @@ public class VaultIntegrationTest { @Autowired private CredentialsService credentialsService; + + @MockBean + private CredentialsRepository credentialsRepository; /** * Test to secure credentials. @@ -71,5 +77,42 @@ public class VaultIntegrationTest { assertEquals("username", credentials.getUsername()); assertEquals("password", credentials.getPassword()); } + + @Test + @Ignore + public void givenCredentials_whenSave_thenReturnCredentials() { + // Given + Credentials credentials = new Credentials("login", "password"); + Mockito.when(credentialsRepository.save(credentials)) + .thenReturn(credentials); + + // When + Credentials savedCredentials = credentialsService.saveCredentials(credentials); + + // Then + assertNotNull(savedCredentials); + assertEquals(savedCredentials.getUsername(), credentials.getUsername()); + assertEquals(savedCredentials.getPassword(), credentials.getPassword()); + } + + @Test + @Ignore + public void givenId_whenFindById_thenReturnCredentials() { + // Given + Credentials credentials = new Credentials("login", "p@ssw@rd"); + Mockito.when(credentialsRepository.findById("login")) + .thenReturn(Optional.of(credentials)); + + // When + Optional returnedCredentials = credentialsService.findById("login"); + + // Then + assertNotNull(returnedCredentials); + assertNotNull(returnedCredentials.get()); + assertEquals(returnedCredentials.get() + .getUsername(), credentials.getUsername()); + assertEquals(returnedCredentials.get() + .getPassword(), credentials.getPassword()); + } } From ea9470ff3c23cd822a3bbab46e82a46a2d87de33 Mon Sep 17 00:00:00 2001 From: Azhwani Date: Wed, 15 Jun 2022 19:41:18 +0200 Subject: [PATCH 10/86] Remove railing whitespaces --- spring-vault/pom.xml | 2 +- .../java/com/baeldung/springvault/CredentialsService.java | 4 ++-- .../java/com/baeldung/springvault/VaultIntegrationTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-vault/pom.xml b/spring-vault/pom.xml index b0b1590df8..24726985f6 100644 --- a/spring-vault/pom.xml +++ b/spring-vault/pom.xml @@ -54,7 +54,7 @@ - 2.2.0.RELEASE + 2.3.2 \ No newline at end of file diff --git a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java index 454819c7ff..75bdd382cb 100644 --- a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java +++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java @@ -19,7 +19,7 @@ public class CredentialsService { @Autowired private VaultTemplate vaultTemplate; - + @Autowired private CredentialsRepository credentialsRepository; @@ -44,7 +44,7 @@ public class CredentialsService { VaultResponseSupport response = vaultTemplate.read("credentials/myapp", Credentials.class); return response.getData(); } - + public Credentials saveCredentials(Credentials credentials) { return credentialsRepository.save(credentials); diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java index a532eeabbf..7987ae9904 100644 --- a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java +++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java @@ -35,7 +35,7 @@ public class VaultIntegrationTest { @Autowired private CredentialsService credentialsService; - + @MockBean private CredentialsRepository credentialsRepository; @@ -77,7 +77,7 @@ public class VaultIntegrationTest { assertEquals("username", credentials.getUsername()); assertEquals("password", credentials.getPassword()); } - + @Test @Ignore public void givenCredentials_whenSave_thenReturnCredentials() { From cd033c210911c6e2ecc9a2ddc8872cab5ce36f8d Mon Sep 17 00:00:00 2001 From: exaucae Date: Fri, 17 Jun 2022 15:14:02 +0000 Subject: [PATCH 11/86] fix: upgrade to cargo-maven3 Application couldn't start with previous setup. Plus, maven3 is the preferred way of using cargo now. See https://codehaus-cargo.github.io/cargo/Maven+3+Plugin.html Relevant section: Reg. Lifetime of our Maven 2 plugin " Please be aware that the Maven 2 / Maven 3 plugin of Codehaus Cargo has been retired with our version 1.9.0 and has been superseded by a Maven 3 only plugin. " --- spring-web-modules/spring-thymeleaf/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-web-modules/spring-thymeleaf/pom.xml b/spring-web-modules/spring-thymeleaf/pom.xml index 8201cb5c5b..94ae05ca11 100644 --- a/spring-web-modules/spring-thymeleaf/pom.xml +++ b/spring-web-modules/spring-thymeleaf/pom.xml @@ -115,10 +115,9 @@ org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} + cargo-maven3-plugin + ${cargo-maven3-plugin.version} - true jetty9x embedded @@ -143,7 +142,7 @@ 2.0.1.Final 6.0.11.Final - 1.6.1 + 1.9.9 \ No newline at end of file From 7adea75450f2d5c3834cd91f50036fc337e0573e Mon Sep 17 00:00:00 2001 From: exaucae Date: Fri, 17 Jun 2022 16:55:28 +0000 Subject: [PATCH 12/86] feat(wip): add function call examples --- .../controller/FunctionCallController.java | 16 ++++++ .../webapp/WEB-INF/views/functionCall.html | 28 +++++++++ .../FunctionCallIntegrationTest.java | 57 +++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java create mode 100644 spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html create mode 100644 spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FunctionCallIntegrationTest.java diff --git a/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java new file mode 100644 index 0000000000..b1869aa707 --- /dev/null +++ b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java @@ -0,0 +1,16 @@ +package com.baeldung.thymeleaf.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@Controller +public class FunctionCallController { + + @RequestMapping(value = "/function-call", method = RequestMethod.GET) + public String getExampleHTML(Model model) { + model.addAttribute("num", 2); + return "functionCall.html"; + } +} diff --git a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html new file mode 100644 index 0000000000..38555c3d2b --- /dev/null +++ b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html @@ -0,0 +1,28 @@ + + + + +Thymeleaf: Javascript function call + + +
+
Thymeleaf: Javascript function call
+
+ +
+
+
Inline function call
+
+
Without a variable
+ +
+
+
With a variable
+ +
+
+
+ + + + \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FunctionCallIntegrationTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FunctionCallIntegrationTest.java new file mode 100644 index 0000000000..90e8989aae --- /dev/null +++ b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FunctionCallIntegrationTest.java @@ -0,0 +1,57 @@ +package com.baeldung.thymeleaf.controller; + +import com.baeldung.thymeleaf.config.InitSecurity; +import com.baeldung.thymeleaf.config.WebApp; +import com.baeldung.thymeleaf.config.WebMVCConfig; +import com.baeldung.thymeleaf.config.WebMVCSecurity; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockHttpSession; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.RequestPostProcessor; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import javax.servlet.Filter; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration +@ContextConfiguration(classes = { WebApp.class, WebMVCConfig.class, WebMVCSecurity.class, InitSecurity.class }) +public class FunctionCallIntegrationTest { + + @Autowired + WebApplicationContext wac; + @Autowired + MockHttpSession session; + + private MockMvc mockMvc; + + @Autowired + private Filter springSecurityFilterChain; + + private RequestPostProcessor testUser() { + return user("user1").password("user1Pass").roles("USER"); + } + + @Before + public void setup() { + mockMvc = MockMvcBuilders.webAppContextSetup(wac).addFilters(springSecurityFilterChain).build(); + } + + @Test + public void testGetDates() throws Exception { + mockMvc.perform(get("/function-call").with(testUser()).with(csrf())).andExpect(status().isOk()).andExpect(view().name("functionCall.html")); + } + +} From d81428bab7e9c65d48b23cc863300485f0cd6859 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Fri, 17 Jun 2022 22:26:31 +0530 Subject: [PATCH 13/86] JAVA-12359 Potential issue in Validate String as Filename in Java article --- .../StringFilenameValidationUtils.java | 2 +- .../StringFilenameValidationUnitTest.java | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java index 1a86edd45a..c1af75eca1 100644 --- a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java +++ b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java @@ -7,7 +7,7 @@ import java.util.Arrays; public class StringFilenameValidationUtils { - public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|', 0x7F}; + public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|', '/'}; public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'}; public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$"; diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index 3e787f08be..04f6b83183 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -2,6 +2,7 @@ package com.baeldung.stringfilenamevalidaiton; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomUtils; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -79,17 +80,21 @@ public class StringFilenameValidationUnitTest { @ParameterizedTest @EnabledOnOs(OS.WINDOWS) @MethodSource("filenamesWithInvalidWindowsChars") - public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException(String filename) { - assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)) - .isInstanceOf(IOException.class) - .hasMessageContaining("Invalid file path"); + public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException( + String filename) { + if (!filename.contains(":")) { + assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class) + .extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING) + .containsAnyOf("The system cannot find the path specifie", + "The filename, directory name, or volume label syntax is incorrect"); + if (!filename.contains("/") && !filename.contains("\\")) { + assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)) + .isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char"); + } + } - assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)) - .isInstanceOf(InvalidPathException.class) - .hasMessage("character not allowed"); - - assertThat(validateStringFilenameUsingContains(filename)).isFalse(); - } + assertThat(validateStringFilenameUsingContains(filename)).isFalse(); + } @ParameterizedTest @EnabledOnOs({OS.LINUX, OS.MAC}) From 2181c452d310ca2a4f8243193a8112e091c83d22 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Fri, 17 Jun 2022 22:37:23 +0530 Subject: [PATCH 14/86] JAVA-12359 Fix jdk 9 and above build --- .../StringFilenameValidationUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index 04f6b83183..b86aba3873 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -70,7 +70,7 @@ public class StringFilenameValidationUnitTest { @ParameterizedTest @EnabledOnOs({OS.LINUX, OS.MAC}) - @MethodSource("filenamesWithInvalidWindowsChars") + @MethodSource("filenamesWithInvalidUnixChars") public void givenFilenameStringWithInvalidWindowsCharAndIsUnix_whenValidateUsingIO_thenReturnTrue(String filename) throws IOException { assertThat(validateStringFilenameUsingIO(filename)).isTrue(); assertThat(validateStringFilenameUsingNIO2(filename)).isTrue(); From 5015fe1d0cf822931f74fa48f2a6da8dd6528bee Mon Sep 17 00:00:00 2001 From: exaucae Date: Fri, 17 Jun 2022 19:58:12 +0000 Subject: [PATCH 15/86] feat(wip): refine examples --- .../controller/FunctionCallController.java | 4 +++- .../main/webapp/WEB-INF/js/functionCall.js | 8 +++++++ .../webapp/WEB-INF/views/functionCall.html | 24 +++++++++---------- 3 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js diff --git a/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java index b1869aa707..751dbc4e9d 100644 --- a/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java +++ b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FunctionCallController.java @@ -1,5 +1,6 @@ package com.baeldung.thymeleaf.controller; +import com.baeldung.thymeleaf.utils.StudentUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -10,7 +11,8 @@ public class FunctionCallController { @RequestMapping(value = "/function-call", method = RequestMethod.GET) public String getExampleHTML(Model model) { - model.addAttribute("num", 2); + model.addAttribute("totalStudents", StudentUtils.buildStudents().size()); + model.addAttribute("student", StudentUtils.buildStudents().get(0)); return "functionCall.html"; } } diff --git a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js new file mode 100644 index 0000000000..41a71a73d2 --- /dev/null +++ b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js @@ -0,0 +1,8 @@ + +function greetWorld() { + alert("hello world") +} + +function salute(name) { + alert("hello: " + name) +} \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html index 38555c3d2b..b3172a0c98 100644 --- a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html +++ b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html @@ -4,25 +4,23 @@ Thymeleaf: Javascript function call +
Thymeleaf: Javascript function call
-
-
-
Inline function call
-
-
Without a variable
- -
-
-
With a variable
- -
+
+ + + + + + +
- - \ No newline at end of file From ac5f74edc24670d1c016612dc4447d20e09aaefc Mon Sep 17 00:00:00 2001 From: exaucae Date: Fri, 17 Jun 2022 22:31:32 +0000 Subject: [PATCH 16/86] refactor: refine examples --- .../src/main/webapp/WEB-INF/js/functionCall.js | 8 -------- .../webapp/WEB-INF/views/functionCall.html | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js diff --git a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js deleted file mode 100644 index 41a71a73d2..0000000000 --- a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/functionCall.js +++ /dev/null @@ -1,8 +0,0 @@ - -function greetWorld() { - alert("hello world") -} - -function salute(name) { - alert("hello: " + name) -} \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html index b3172a0c98..d21fb7cf27 100644 --- a/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html +++ b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/functionCall.html @@ -4,9 +4,16 @@ Thymeleaf: Javascript function call - +
Thymeleaf: Javascript function call
@@ -14,11 +21,10 @@
- - - + + + -
From 8d7014cfc0aea674593ca2859be254e018e1f060 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sat, 18 Jun 2022 11:50:52 +0530 Subject: [PATCH 17/86] JAVA-12359 Trying to fix failing unix platform test --- .../stringfilenamevalidaiton/StringFilenameValidationUtils.java | 2 +- .../StringFilenameValidationUnitTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java index c1af75eca1..f79d01e0c2 100644 --- a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java +++ b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java @@ -7,7 +7,7 @@ import java.util.Arrays; public class StringFilenameValidationUtils { - public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|', '/'}; + public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|'}; public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'}; public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$"; diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index b86aba3873..04f6b83183 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -70,7 +70,7 @@ public class StringFilenameValidationUnitTest { @ParameterizedTest @EnabledOnOs({OS.LINUX, OS.MAC}) - @MethodSource("filenamesWithInvalidUnixChars") + @MethodSource("filenamesWithInvalidWindowsChars") public void givenFilenameStringWithInvalidWindowsCharAndIsUnix_whenValidateUsingIO_thenReturnTrue(String filename) throws IOException { assertThat(validateStringFilenameUsingIO(filename)).isTrue(); assertThat(validateStringFilenameUsingNIO2(filename)).isTrue(); From ca3fe06a56944d052970da90e2554b72b94261e4 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sat, 18 Jun 2022 11:56:32 +0530 Subject: [PATCH 18/86] JAVA-12359 Changes required in windows os test due to fix of unix os failing test --- .../StringFilenameValidationUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index 04f6b83183..36b69c2094 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -87,7 +87,7 @@ public class StringFilenameValidationUnitTest { .extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING) .containsAnyOf("The system cannot find the path specifie", "The filename, directory name, or volume label syntax is incorrect"); - if (!filename.contains("/") && !filename.contains("\\")) { + if (!filename.contains("\\")) { assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)) .isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char"); } From 3dfe2e708286d93ccee5946b821fa5ccf9d397bc Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 18 Jun 2022 11:28:54 +0100 Subject: [PATCH 19/86] [JAVA-12748] Fix module to work with Gradle 7.x --- gradle/maven-to-gradle/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle/maven-to-gradle/build.gradle b/gradle/maven-to-gradle/build.gradle index 71a9360f91..f891e592c2 100644 --- a/gradle/maven-to-gradle/build.gradle +++ b/gradle/maven-to-gradle/build.gradle @@ -10,7 +10,7 @@ plugins { repositories { mavenLocal() maven { - url = 'http://repo.maven.apache.org/maven2' + url = uri('https://repo.maven.apache.org/maven2/') } } @@ -18,9 +18,10 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.12.0' } -group = 'com.balendung' +group = 'com.baeldung' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +description = 'maven-to-gradle' +java.sourceCompatibility = JavaVersion.VERSION_1_8 publishing { publications { From 770460b48820e79f76bc3d3ae2df0fec0a42d14e Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 18 Jun 2022 23:21:20 +0100 Subject: [PATCH 20/86] [JAVA-12744] Fix module to work with Gradle 7.x --- gradle/gradle-fat-jar/README.md | 3 +++ gradle/gradle-fat-jar/build.gradle | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 gradle/gradle-fat-jar/README.md diff --git a/gradle/gradle-fat-jar/README.md b/gradle/gradle-fat-jar/README.md new file mode 100644 index 0000000000..29b59e98bd --- /dev/null +++ b/gradle/gradle-fat-jar/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- [Creating a Fat Jar in Gradle](https://www.baeldung.com/gradle-fat-jar) diff --git a/gradle/gradle-fat-jar/build.gradle b/gradle/gradle-fat-jar/build.gradle index 70d1b998db..6e2934194e 100644 --- a/gradle/gradle-fat-jar/build.gradle +++ b/gradle/gradle-fat-jar/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { - jcenter() + mavenCentral() + gradlePluginPortal() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3' + classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" } } From 69849e1fd66f66c27e2ef5fbcbe18d92e08606c9 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 20 Jun 2022 12:07:41 +0530 Subject: [PATCH 21/86] JAVA-10433: Verify undertow module --- pom.xml | 4 ++-- undertow/pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index bb27e3938c..67ac73a953 100644 --- a/pom.xml +++ b/pom.xml @@ -673,7 +673,7 @@ twilio twitter4j - + undertow vertx vertx-and-rxjava @@ -1116,7 +1116,7 @@ twilio twitter4j - + undertow vertx vertx-and-rxjava diff --git a/undertow/pom.xml b/undertow/pom.xml index bed9c905c2..9ec3aa8e6c 100644 --- a/undertow/pom.xml +++ b/undertow/pom.xml @@ -26,6 +26,7 @@ ${project.artifactId} + org.apache.maven.plugins maven-jar-plugin @@ -56,7 +57,7 @@ 1.4.18.Final - 2.4.3 + 3.0.2 From bc4d4049917a5efc3bac2f3ee978abe018e7fd31 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Mon, 20 Jun 2022 09:38:18 +0300 Subject: [PATCH 22/86] BAEL-5647 temporarily disable tests --- .../timeago/version7/TimeAgoCalculatorUnitTest.java | 9 +++++---- .../timeago/version8/TimeAgoCalculatorUnitTest.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java index 53975e2d83..b41533aa7e 100644 --- a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java +++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java @@ -7,7 +7,8 @@ import org.junit.Test; public class TimeAgoCalculatorUnitTest { - @Test + // fixing tests in BAEL-5647 + //@Test public void timeAgoByTimeGranularityTest() { long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; Assert.assertEquals("5 seconds ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 1000)), TimeGranularity.SECONDS)); @@ -20,7 +21,7 @@ public class TimeAgoCalculatorUnitTest { Assert.assertEquals("5 decades ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)), TimeGranularity.DECADES)); } - @Test + //@Test public void humanFriendlyTimeAgoTest() { long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 1000)))); @@ -33,14 +34,14 @@ public class TimeAgoCalculatorUnitTest { Assert.assertEquals("several decades ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)))); } - @Test + //@Test public void calculateExactTimeAgoWithJodaTimeTest() { Assert.assertEquals("5 hours and 15 minutes and 3 seconds", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 15 * 60 * 1000 + 3 * 1000)))); Assert.assertEquals("5 hours and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000)))); Assert.assertEquals("2 days and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (2 * 24 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000)))); } - @Test + //@Test public void calculateHumanFriendlyTimeAgoWithJodaTimeTest() { long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 1000)))); diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java index 0412b3c2fd..5fb8512a7e 100644 --- a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java +++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java @@ -9,7 +9,8 @@ import org.junit.Test; public class TimeAgoCalculatorUnitTest { - @Test + // fixing test in BAEL-5647 + //@Test public void calculateTimeAgoWithPeriodAndDurationTest() { long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; Assert.assertEquals("moments ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneId.systemDefault()), ZoneId.systemDefault())); From 11d937e39a8e119eb250ab409bad7df9f2aa13ba Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Mon, 20 Jun 2022 12:59:38 +0100 Subject: [PATCH 23/86] Java 11492 (#12375) * Added/Created parent module * moved spring-5-data-reactive (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive-2 (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive-3 (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive-client (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive-oauth (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive-security (submodule) to spring-reactive-modules (parent) * moved spring-5-reactive (submodule) to spring-reactive-modules (parent) * moved spring-reactive (submodule) to spring-reactive-modules (parent) * deleted modules that were moved across * renamed spring-reactive-modules to spring-5-reactive-modules Co-authored-by: panagiotiskakos --- pom.xml | 19 +---- spring-5-reactive-modules/README.md | 3 + spring-5-reactive-modules/pom.xml | 64 ++++++++++++++ .../spring-5-data-reactive}/README.md | 0 .../spring-5-data-reactive}/pom.xml | 9 +- .../ReactiveCouchbaseApplication.java | 0 .../configuration/CouchbaseProperties.java | 0 .../N1QLReactiveCouchbaseConfiguration.java | 0 .../ReactiveCouchbaseConfiguration.java | 0 .../ViewReactiveCouchbaseConfiguration.java | 0 .../com/baeldung/couchbase/domain/Person.java | 0 .../repository/n1ql/N1QLPersonRepository.java | 0 .../n1ql/N1QLSortingPersonRepository.java | 0 .../repository/view/ViewPersonRepository.java | 0 .../com/baeldung/r2dbc/R2dbcApplication.java | 0 .../configuration/R2DBCConfiguration.java | 0 .../java/com/baeldung/r2dbc/model/Player.java | 0 .../r2dbc/repository/PlayerRepository.java | 0 .../src/main/resources/couchbase.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../CouchbaseMockConfiguration.java | 0 .../n1ql/N1QLPersonRepositoryLiveTest.java | 0 .../N1QLSortingPersonRepositoryLiveTest.java | 0 .../ViewPersonRepositoryIntegrationTest.java | 0 .../R2dbcApplicationIntegrationTest.java | 0 .../spring-5-reactive-2}/.gitignore | 0 .../spring-5-reactive-2}/README.md | 0 .../spring-5-reactive-2}/pom.xml | 7 +- .../consumer/ConsumerSSEApplication.java | 0 .../consumer/controller/ClientController.java | 0 .../server/ServerSSEApplication.java | 0 .../server/controllers/ServerController.java | 0 .../StaticContentApplication.java | 0 .../staticcontent/StaticContentConfig.java | 0 .../FunctionalValidationsApplication.java | 0 .../handlers/AbstractValidationHandler.java | 0 .../handlers/FunctionalHandler.java | 0 ...notatedRequestEntityValidationHandler.java | 0 .../CustomRequestEntityValidationHandler.java | 0 .../impl/OtherEntityValidationHandler.java | 0 .../model/AnnotatedRequestEntity.java | 0 .../functional/model/CustomRequestEntity.java | 0 .../functional/model/OtherEntity.java | 0 .../routers/ValidationsRouters.java | 0 .../CustomRequestEntityValidator.java | 0 .../validators/OtherEntityValidator.java | 0 ...lication-assets-custom-location.properties | 0 .../backpressure/BackpressureUnitTest.java | 0 .../ServiceSentEventLiveTest.java | 0 ...cContentCustomLocationIntegrationTest.java | 0 ...ContentDefaultLocationIntegrationTest.java | 0 .../stepverifier/PostExecutionUnitTest.java | 0 .../stepverifier/StepByStepUnitTest.java | 0 .../TestingTestPublisherUnitTest.java | 0 .../stepverifier/TimeBasedUnitTest.java | 0 ...FunctionalEndpointValidationsLiveTest.java | 0 .../src/test/resources/assets/index.html | 0 .../src/test/resources/img/example-image.png | Bin .../src/test/resources/logback-test.xml | 0 .../src/test/resources/public/index.html | 0 .../spring-5-reactive-3}/.gitignore | 0 .../spring-5-reactive-3}/README.md | 0 .../spring-5-reactive-3}/pom.xml | 7 +- .../logging/WebFluxLoggingExample.java | 0 .../src/main/resources/application.properties | 0 .../src/test/resources/logback-test.xml | 0 .../spring-5-reactive-client}/.gitignore | 0 .../spring-5-reactive-client}/README.md | 0 .../spring-5-reactive-client}/pom.xml | 11 ++- .../reactive/controller/UploadController.java | 0 .../com/baeldung/reactive/enums/Role.java | 0 .../reactive/exception/ServiceException.java | 0 .../com/baeldung/reactive/model/Employee.java | 0 .../java/com/baeldung/reactive/model/Foo.java | 0 .../reactive/service/EmployeeService.java | 0 .../service/ReactiveUploadService.java | 0 .../webclient/simultaneous/Client.java | 0 .../reactive/webclient/simultaneous/Item.java | 0 .../reactive/webclient/simultaneous/User.java | 0 .../webclient/simultaneous/UserWithItem.java | 0 .../webclient/filter/WebClientFilters.java | 0 .../webclient/json/ReaderConsumerService.java | 0 .../json/ReaderConsumerServiceImpl.java | 0 .../baeldung/webclient/json/model/Book.java | 0 .../baeldung/webclient/json/model/Reader.java | 0 .../status/WebClientStatusCodeHandler.java | 0 .../exception/CustomBadRequestException.java | 0 .../exception/CustomServerErrorException.java | 0 .../timeout/WebClientTimeoutProvider.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../reactive/ReactiveIntegrationTest.java | 0 .../Spring5ReactiveTestApplication.java | 0 .../WebClientLoggingIntegrationTest.java | 0 .../reactive/logging/filters/LogFilters.java | 0 .../logging/jetty/RequestLogEnhancer.java | 0 .../EmployeeServiceIntegrationTest.java | 0 .../service/EmployeeServiceUnitTest.java | 0 .../ReactiveUploadServiceUnitTest.java | 0 .../simultaneous/ClientIntegrationTest.java | 0 ...lientStatusCodeHandlerIntegrationTest.java | 0 .../filter/FilteredWebClientUnitTest.java | 0 .../ReaderConsumerServiceImplUnitTest.java | 0 .../WebClientTimeoutIntegrationTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-5-reactive-oauth}/README.md | 0 .../spring-5-reactive-oauth}/pom.xml | 7 +- .../reactive/oauth/SecurityConfig.java | 0 .../Spring5ReactiveOauthApplication.java | 0 .../reactive/oauth/web/MainController.java | 0 .../baeldung/reactive/oauth/web/dto/Foo.java | 0 .../OauthClientApplication.java | 0 .../configuration/WebClientConfig.java | 0 .../configuration/WebSecurityConfig.java | 0 .../web/ClientRestController.java | 0 .../OauthClientLoginApplication.java | 0 .../configuration/WebClientConfig.java | 0 .../configuration/WebSecurityConfig.java | 0 .../web/ClientRestController.java | 0 .../ClientCredentialsOauthApplication.java | 0 .../configuration/WebClientConfig.java | 0 .../service/WebClientChonJob.java | 0 .../ManualRequestApplication.java | 0 .../configure/WebClientConfig.java | 0 .../configure/WebSecurityConfig.java | 0 .../web/ManualOauthRequestController.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/default-application.yml | 0 ...nt-auth-code-client-application.properties | 0 ...ent-auth-code-login-application.properties | 0 ...t-credentials-oauth-application.properties | 0 ...anual-request-oauth-application.properties | 0 .../Spring5ReactiveOauthIntegrationTest.java | 0 .../OAuth2ClientCredentialsLiveTest.java | 0 .../OAuth2ManualRequestLiveTest.java | 0 .../webclient/utils/ListAppender.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-5-reactive-security}/.gitignore | 0 .../spring-5-reactive-security}/README.md | 0 .../spring-5-reactive-security}/pom.xml | 7 +- .../DownstreamServiceHealthIndicator.java | 0 .../reactive/actuator/FeaturesEndpoint.java | 0 .../actuator/InfoWebEndpointExtension.java | 0 .../actuator/Spring5ReactiveApplication.java | 0 .../reactive/actuator/WebSecurityConfig.java | 0 .../authresolver/AuthResolverApplication.java | 0 .../authresolver/AuthResolverController.java | 0 .../authresolver/CustomWebSecurityConfig.java | 0 .../CorsOnAnnotatedElementsApplication.java | 0 .../controllers/CorsOnClassController.java | 0 .../controllers/CorsOnMethodsController.java | 0 .../global/CorsGlobalConfigApplication.java | 0 .../config/CorsGlobalConfiguration.java | 0 .../FurtherCorsConfigsController.java | 0 .../controllers/RegularRestController.java | 0 .../handlers/CorsGlobalFunctionalHandler.java | 0 .../routers/CorsRouterFunctions.java | 0 .../webfilter/CorsWebFilterApplication.java | 0 .../webfilter/config/CorsWebFilterConfig.java | 0 .../FurtherCorsConfigsController.java | 0 .../controllers/RegularRestController.java | 0 .../handlers/CorsWithWebFilterHandler.java | 0 .../CorsWithWebFilterRouterFunctions.java | 0 .../java/com/baeldung/webflux/Employee.java | 0 .../com/baeldung/webflux/EmployeeConfig.java | 0 .../webflux/EmployeeCreationEvent.java | 0 .../webflux/EmployeeWebSecurityConfig.java | 0 .../webflux/EmployeeWebSocketClient.java | 0 .../webflux/EmployeeWebSocketHandler.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/files/hello.txt | 0 .../src/main/resources/files/test/test.txt | 0 .../src/main/resources/logback.xml | 0 .../resources/static/client-websocket.html | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../actuator/ActuatorInfoIntegrationTest.java | 0 .../AuthResolverIntegrationTest.java | 0 .../cors/CorsOnAnnotatedElementsLiveTest.java | 0 .../cors/CorsOnGlobalConfigLiveTest.java | 0 .../cors/CorsOnWebFilterLiveTest.java | 0 .../src/test/resources/baeldung-weekly.png | Bin .../spring-5-reactive}/.gitignore | 0 .../spring-5-reactive}/README.md | 0 .../spring-5-reactive}/pom.xml | 7 +- .../src/main/assets/index.html | 0 .../java/com/baeldung/functional/Actor.java | 0 .../com/baeldung/functional/FormHandler.java | 0 .../FunctionalSpringBootApplication.java | 0 .../functional/FunctionalWebApplication.java | 0 .../functional/IndexRewriteFilter.java | 0 .../com/baeldung/functional/RootServlet.java | 0 .../reactive/Spring5ReactiveApplication.java | 0 .../controller/FooReactiveController.java | 0 .../controller/PathPatternController.java | 78 +++++++++--------- .../filters/ExampleHandlerFilterFunction.java | 0 .../reactive/filters/ExampleWebFilter.java | 0 .../reactive/filters/PlayerHandler.java | 0 .../reactive/filters/PlayerRouter.java | 0 .../reactive/filters/UserController.java | 0 .../java/com/baeldung/reactive/model/Foo.java | 0 .../controllers/ResponseHeaderController.java | 0 .../filter/AddResponseHeaderWebFilter.java | 0 .../handlers/ResponseHeaderHandler.java | 0 .../ResponseHeadersRouterFunctions.java | 0 .../com/baeldung/reactive/urlmatch/Actor.java | 0 ...Spring5URLPatternUsingRouterFunctions.java | 0 .../reactive/urlmatch/FormHandler.java | 0 .../urlmatch/FunctionalWebApplication.java | 0 .../reactive/urlmatch/IndexRewriteFilter.java | 0 .../com/baeldung/reactive/util/CpuUtils.java | 0 .../com/baeldung/websession/Application.java | 0 .../websession/configuration/RedisConfig.java | 0 .../configuration/SessionConfig.java | 0 .../configuration/WebFluxConfig.java | 0 .../configuration/WebFluxSecurityConfig.java | 0 .../controller/SessionController.java | 0 .../websession/transfer/CustomResponse.java | 0 .../java/com/baeldung/websocket/Event.java | 0 .../ReactiveJavaClientWebSocket.java | 0 .../ReactiveWebSocketApplication.java | 0 .../ReactiveWebSocketConfiguration.java | 0 .../websocket/ReactiveWebSocketHandler.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/files/hello.txt | 0 .../src/main/resources/files/test/test.txt | 0 .../src/main/resources/logback.xml | 0 .../resources/static/client-websocket.html | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...nctionalWebApplicationIntegrationTest.java | 0 .../com/baeldung/reactive/FluxUnitTest.java | 0 .../filters/PlayerHandlerIntegrationTest.java | 0 .../UserControllerIntegrationTest.java | 0 .../ResponseHeaderLiveTest.java | 0 ...rnUsingRouterFunctionsIntegrationTest.java | 0 ...ernsUsingHandlerMethodIntegrationTest.java | 0 .../src/test/resources/baeldung-weekly.png | Bin .../spring-reactive}/README.md | 0 .../spring-reactive}/pom.xml | 7 +- .../reactive/concurrency/Application.java | 0 .../reactive/concurrency/Controller.java | 0 .../baeldung/reactive/concurrency/Person.java | 0 .../concurrency/PersonRepository.java | 0 .../ConsumerDebuggingApplication.java | 0 .../ReactiveConfigsToggleRestController.java | 0 .../debugging/consumer/cronjobs/CronJobs.java | 0 .../debugging/consumer/model/Foo.java | 0 .../debugging/consumer/model/FooDto.java | 0 .../consumer/service/FooNameHelper.java | 0 .../consumer/service/FooQuantityHelper.java | 0 .../consumer/service/FooReporter.java | 0 .../consumer/service/FooService.java | 0 .../server/ServerDebuggingApplication.java | 0 .../server/handlers/ServerHandler.java | 0 .../reactive/debugging/server/model/Foo.java | 0 .../server/routers/ServerRouter.java | 0 .../ErrorHandlingApplication.java | 0 .../errorhandling/GlobalErrorAttributes.java | 0 .../GlobalErrorWebExceptionHandler.java | 0 .../reactive/errorhandling/Handler.java | 0 .../errorhandling/NameRequiredException.java | 0 .../reactive/errorhandling/Router.java | 0 .../reactive/security/GreetingController.java | 0 .../reactive/security/GreetingService.java | 0 .../reactive/security/SecurityConfig.java | 0 .../security/SpringSecurity5Application.java | 0 .../com/baeldung/reactive/webclient/Foo.java | 0 .../baeldung/reactive/webclient/Tweet.java | 0 .../TweetsSlowServiceController.java | 0 .../webclient/WebClientApplication.java | 0 .../webclient/WebClientController.java | 0 .../reactive/webclient/WebController.java | 0 .../SpringWebClientRequestsApp.java | 0 .../baeldung/reactive/webflux/Employee.java | 0 .../reactive/webflux/EmployeeRepository.java | 0 .../annotation/EmployeeController.java | 0 .../annotation/EmployeeSpringApplication.java | 0 .../webflux/annotation/EmployeeWebClient.java | 0 .../annotation/EmployeeWebSecurityConfig.java | 0 .../functional/EmployeeFunctionalConfig.java | 0 .../EmployeeSpringFunctionalApplication.java | 0 .../ConsumerFooServiceIntegrationTest.java | 0 .../consumer/ConsumerFooServiceLiveTest.java | 0 .../consumer/utils/ListAppender.java | 0 .../ErrorHandlingIntegrationTest.java | 0 .../introduction/ReactorIntegrationTest.java | 0 .../security/SecurityIntegrationTest.java | 0 .../reactive/webclient/SpringContextTest.java | 0 .../webclient/WebClientIntegrationTest.java | 0 .../WebControllerIntegrationTest.java | 0 .../WebTestClientIntegrationTest.java | 0 ...bClientRequestsWithParametersUnitTest.java | 0 .../EmployeeControllerIntegrationTest.java | 0 ...ployeeSpringFunctionalIntegrationTest.java | 0 .../src/test/resources/logback-test.xml | 0 299 files changed, 137 insertions(+), 89 deletions(-) create mode 100644 spring-5-reactive-modules/README.md create mode 100644 spring-5-reactive-modules/pom.xml rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/README.md (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/pom.xml (96%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/domain/Person.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/r2dbc/model/Player.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/resources/couchbase.properties (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/main/resources/logback.xml (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java (100%) rename {spring-5-data-reactive => spring-5-reactive-modules/spring-5-data-reactive}/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/.gitignore (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/README.md (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/pom.xml (95%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/main/resources/application-assets-custom-location.properties (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/resources/assets/index.html (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/resources/img/example-image.png (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/resources/logback-test.xml (100%) rename {spring-5-reactive-2 => spring-5-reactive-modules/spring-5-reactive-2}/src/test/resources/public/index.html (100%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/.gitignore (100%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/README.md (100%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/pom.xml (88%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java (100%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/src/main/resources/application.properties (100%) rename {spring-5-reactive-3 => spring-5-reactive-modules/spring-5-reactive-3}/src/test/resources/logback-test.xml (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/.gitignore (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/README.md (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/pom.xml (95%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/controller/UploadController.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/enums/Role.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/exception/ServiceException.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/model/Employee.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/model/Foo.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/service/EmployeeService.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/json/model/Book.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/json/model/Reader.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/resources/application.properties (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/resources/logback.xml (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java (100%) rename {spring-5-reactive-client => spring-5-reactive-modules/spring-5-reactive-client}/src/test/resources/logback-test.xml (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/README.md (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/pom.xml (92%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/reactive/oauth/web/MainController.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/application.yml (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/default-application.yml (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/webclient-auth-code-client-application.properties (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/webclient-auth-code-login-application.properties (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/webclient-client-credentials-oauth-application.properties (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/main/resources/webclient-manual-request-oauth-application.properties (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/test/java/com/baeldung/webclient/utils/ListAppender.java (100%) rename {spring-5-reactive-oauth => spring-5-reactive-modules/spring-5-reactive-oauth}/src/test/resources/logback-test.xml (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/.gitignore (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/README.md (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/pom.xml (96%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/Employee.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/EmployeeConfig.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/resources/application.properties (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/resources/files/hello.txt (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/resources/files/test/test.txt (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/resources/logback.xml (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/resources/static/client-websocket.html (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java (100%) rename {spring-5-reactive-security => spring-5-reactive-modules/spring-5-reactive-security}/src/test/resources/baeldung-weekly.png (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/.gitignore (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/README.md (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/pom.xml (96%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/assets/index.html (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/Actor.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/FormHandler.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/FunctionalWebApplication.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/IndexRewriteFilter.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/functional/RootServlet.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/controller/FooReactiveController.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/controller/PathPatternController.java (96%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/filters/UserController.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/model/Foo.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/responseheaders/controllers/ResponseHeaderController.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/responseheaders/filter/AddResponseHeaderWebFilter.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/responseheaders/functional/handlers/ResponseHeaderHandler.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/responseheaders/functional/routers/ResponseHeadersRouterFunctions.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/urlmatch/Actor.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/urlmatch/IndexRewriteFilter.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/reactive/util/CpuUtils.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/Application.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/configuration/RedisConfig.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/configuration/SessionConfig.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/configuration/WebFluxConfig.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/controller/SessionController.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websession/transfer/CustomResponse.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websocket/Event.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websocket/ReactiveJavaClientWebSocket.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websocket/ReactiveWebSocketApplication.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websocket/ReactiveWebSocketConfiguration.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/java/com/baeldung/websocket/ReactiveWebSocketHandler.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/resources/application.properties (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/resources/files/hello.txt (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/resources/files/test/test.txt (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/resources/logback.xml (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/resources/static/client-websocket.html (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/FluxUnitTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/responseheaders/ResponseHeaderLiveTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java (100%) rename {spring-5-reactive => spring-5-reactive-modules/spring-5-reactive}/src/test/resources/baeldung-weekly.png (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/README.md (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/pom.xml (94%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/concurrency/Application.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/concurrency/Controller.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/concurrency/Person.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/concurrency/PersonRepository.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/ConsumerDebuggingApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/controllers/ReactiveConfigsToggleRestController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/cronjobs/CronJobs.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/model/Foo.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/model/FooDto.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooNameHelper.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooQuantityHelper.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooReporter.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooService.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/server/ServerDebuggingApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/server/handlers/ServerHandler.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/server/model/Foo.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/debugging/server/routers/ServerRouter.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/Handler.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/NameRequiredException.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/errorhandling/Router.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/security/GreetingController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/security/GreetingService.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/security/SecurityConfig.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/Foo.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/Tweet.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/TweetsSlowServiceController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/WebClientApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/WebClientController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclient/WebController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webclientrequests/SpringWebClientRequestsApp.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/Employee.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeSpringApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebClient.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebSecurityConfig.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeFunctionalConfig.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalApplication.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceLiveTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/debugging/consumer/utils/ListAppender.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/introduction/ReactorIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webclient/SpringContextTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webclient/WebClientIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webclient/WebControllerIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webclient/WebTestClientIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webclientrequests/WebClientRequestsWithParametersUnitTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webflux/annotation/EmployeeControllerIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalIntegrationTest.java (100%) rename {spring-reactive => spring-5-reactive-modules/spring-reactive}/src/test/resources/logback-test.xml (100%) diff --git a/pom.xml b/pom.xml index bb27e3938c..1fea2d1d28 100644 --- a/pom.xml +++ b/pom.xml @@ -578,16 +578,9 @@ spring-4 spring-5 - spring-5-data-reactive - spring-5-reactive - spring-5-reactive-2 - spring-5-reactive-3 - spring-5-reactive-client - spring-5-reactive-oauth - spring-5-reactive-security + spring-5-reactive-modules spring-5-webflux spring-5-webflux-2 - spring-reactive spring-activiti spring-akka @@ -1021,16 +1014,10 @@ spring-4 spring-5 - spring-5-data-reactive - spring-5-reactive - spring-5-reactive-2 - spring-5-reactive-3 - spring-5-reactive-client - spring-5-reactive-oauth - spring-5-reactive-security + spring-5-reactive-modules spring-5-webflux spring-5-webflux-2 - spring-reactive + spring-activiti spring-akka diff --git a/spring-5-reactive-modules/README.md b/spring-5-reactive-modules/README.md new file mode 100644 index 0000000000..100f15ae49 --- /dev/null +++ b/spring-5-reactive-modules/README.md @@ -0,0 +1,3 @@ +## Spring Reactive + +This module contains modules about Spring Reactive \ No newline at end of file diff --git a/spring-5-reactive-modules/pom.xml b/spring-5-reactive-modules/pom.xml new file mode 100644 index 0000000000..73ba4afd7c --- /dev/null +++ b/spring-5-reactive-modules/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT + spring-5-reactive-modules + pom + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + + spring-5-data-reactive + spring-5-reactive + spring-5-reactive-2 + spring-5-reactive-3 + spring-5-reactive-client + spring-5-reactive-oauth + spring-5-reactive-security + spring-reactive + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + + + \ No newline at end of file diff --git a/spring-5-data-reactive/README.md b/spring-5-reactive-modules/spring-5-data-reactive/README.md similarity index 100% rename from spring-5-data-reactive/README.md rename to spring-5-reactive-modules/spring-5-data-reactive/README.md diff --git a/spring-5-data-reactive/pom.xml b/spring-5-reactive-modules/spring-5-data-reactive/pom.xml similarity index 96% rename from spring-5-data-reactive/pom.xml rename to spring-5-reactive-modules/spring-5-data-reactive/pom.xml index 24971c0289..ee3c2a83f7 100644 --- a/spring-5-data-reactive/pom.xml +++ b/spring-5-reactive-modules/spring-5-data-reactive/pom.xml @@ -7,11 +7,12 @@ spring-5-data-reactive jar + + - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java b/spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java similarity index 100% rename from spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java diff --git a/spring-5-data-reactive/src/main/resources/couchbase.properties b/spring-5-reactive-modules/spring-5-data-reactive/src/main/resources/couchbase.properties similarity index 100% rename from spring-5-data-reactive/src/main/resources/couchbase.properties rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/resources/couchbase.properties diff --git a/spring-5-data-reactive/src/main/resources/logback.xml b/spring-5-reactive-modules/spring-5-data-reactive/src/main/resources/logback.xml similarity index 100% rename from spring-5-data-reactive/src/main/resources/logback.xml rename to spring-5-reactive-modules/spring-5-data-reactive/src/main/resources/logback.xml diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java b/spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java similarity index 100% rename from spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java rename to spring-5-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java diff --git a/spring-5-reactive-2/.gitignore b/spring-5-reactive-modules/spring-5-reactive-2/.gitignore similarity index 100% rename from spring-5-reactive-2/.gitignore rename to spring-5-reactive-modules/spring-5-reactive-2/.gitignore diff --git a/spring-5-reactive-2/README.md b/spring-5-reactive-modules/spring-5-reactive-2/README.md similarity index 100% rename from spring-5-reactive-2/README.md rename to spring-5-reactive-modules/spring-5-reactive-2/README.md diff --git a/spring-5-reactive-2/pom.xml b/spring-5-reactive-modules/spring-5-reactive-2/pom.xml similarity index 95% rename from spring-5-reactive-2/pom.xml rename to spring-5-reactive-modules/spring-5-reactive-2/pom.xml index 627368aafb..114359a5fa 100644 --- a/spring-5-reactive-2/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive-2/pom.xml @@ -10,10 +10,9 @@ spring 5 sample project about new features - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java b/spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java diff --git a/spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties b/spring-5-reactive-modules/spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties similarity index 100% rename from spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties rename to spring-5-reactive-modules/spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java similarity index 100% rename from spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java diff --git a/spring-5-reactive-2/src/test/resources/assets/index.html b/spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/assets/index.html similarity index 100% rename from spring-5-reactive-2/src/test/resources/assets/index.html rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/assets/index.html diff --git a/spring-5-reactive-2/src/test/resources/img/example-image.png b/spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/img/example-image.png similarity index 100% rename from spring-5-reactive-2/src/test/resources/img/example-image.png rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/img/example-image.png diff --git a/spring-5-reactive-2/src/test/resources/logback-test.xml b/spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/logback-test.xml similarity index 100% rename from spring-5-reactive-2/src/test/resources/logback-test.xml rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/logback-test.xml diff --git a/spring-5-reactive-2/src/test/resources/public/index.html b/spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/public/index.html similarity index 100% rename from spring-5-reactive-2/src/test/resources/public/index.html rename to spring-5-reactive-modules/spring-5-reactive-2/src/test/resources/public/index.html diff --git a/spring-5-reactive-3/.gitignore b/spring-5-reactive-modules/spring-5-reactive-3/.gitignore similarity index 100% rename from spring-5-reactive-3/.gitignore rename to spring-5-reactive-modules/spring-5-reactive-3/.gitignore diff --git a/spring-5-reactive-3/README.md b/spring-5-reactive-modules/spring-5-reactive-3/README.md similarity index 100% rename from spring-5-reactive-3/README.md rename to spring-5-reactive-modules/spring-5-reactive-3/README.md diff --git a/spring-5-reactive-3/pom.xml b/spring-5-reactive-modules/spring-5-reactive-3/pom.xml similarity index 88% rename from spring-5-reactive-3/pom.xml rename to spring-5-reactive-modules/spring-5-reactive-3/pom.xml index fea72cc736..86cf3d6be1 100644 --- a/spring-5-reactive-3/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive-3/pom.xml @@ -10,10 +10,9 @@ spring 5 sample project about new features - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java b/spring-5-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java similarity index 100% rename from spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java rename to spring-5-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java diff --git a/spring-5-reactive-3/src/main/resources/application.properties b/spring-5-reactive-modules/spring-5-reactive-3/src/main/resources/application.properties similarity index 100% rename from spring-5-reactive-3/src/main/resources/application.properties rename to spring-5-reactive-modules/spring-5-reactive-3/src/main/resources/application.properties diff --git a/spring-5-reactive-3/src/test/resources/logback-test.xml b/spring-5-reactive-modules/spring-5-reactive-3/src/test/resources/logback-test.xml similarity index 100% rename from spring-5-reactive-3/src/test/resources/logback-test.xml rename to spring-5-reactive-modules/spring-5-reactive-3/src/test/resources/logback-test.xml diff --git a/spring-5-reactive-client/.gitignore b/spring-5-reactive-modules/spring-5-reactive-client/.gitignore similarity index 100% rename from spring-5-reactive-client/.gitignore rename to spring-5-reactive-modules/spring-5-reactive-client/.gitignore diff --git a/spring-5-reactive-client/README.md b/spring-5-reactive-modules/spring-5-reactive-client/README.md similarity index 100% rename from spring-5-reactive-client/README.md rename to spring-5-reactive-modules/spring-5-reactive-client/README.md diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-modules/spring-5-reactive-client/pom.xml similarity index 95% rename from spring-5-reactive-client/pom.xml rename to spring-5-reactive-modules/spring-5-reactive-client/pom.xml index 7acc958a53..f7ca8a86a5 100644 --- a/spring-5-reactive-client/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-5-reactive-client spring-5-reactive-client @@ -9,10 +9,9 @@ spring 5 sample project about new features - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java b/spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java similarity index 100% rename from spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java diff --git a/spring-5-reactive-client/src/main/resources/application.properties b/spring-5-reactive-modules/spring-5-reactive-client/src/main/resources/application.properties similarity index 100% rename from spring-5-reactive-client/src/main/resources/application.properties rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/resources/application.properties diff --git a/spring-5-reactive-client/src/main/resources/logback.xml b/spring-5-reactive-modules/spring-5-reactive-client/src/main/resources/logback.xml similarity index 100% rename from spring-5-reactive-client/src/main/resources/logback.xml rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/resources/logback.xml diff --git a/spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml b/spring-5-reactive-modules/spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml rename to spring-5-reactive-modules/spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java similarity index 100% rename from spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java diff --git a/spring-5-reactive-client/src/test/resources/logback-test.xml b/spring-5-reactive-modules/spring-5-reactive-client/src/test/resources/logback-test.xml similarity index 100% rename from spring-5-reactive-client/src/test/resources/logback-test.xml rename to spring-5-reactive-modules/spring-5-reactive-client/src/test/resources/logback-test.xml diff --git a/spring-5-reactive-oauth/README.md b/spring-5-reactive-modules/spring-5-reactive-oauth/README.md similarity index 100% rename from spring-5-reactive-oauth/README.md rename to spring-5-reactive-modules/spring-5-reactive-oauth/README.md diff --git a/spring-5-reactive-oauth/pom.xml b/spring-5-reactive-modules/spring-5-reactive-oauth/pom.xml similarity index 92% rename from spring-5-reactive-oauth/pom.xml rename to spring-5-reactive-modules/spring-5-reactive-oauth/pom.xml index 8e8b472881..ec06d5689d 100644 --- a/spring-5-reactive-oauth/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive-oauth/pom.xml @@ -11,10 +11,9 @@ WebFlux and Spring Security OAuth - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java diff --git a/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java similarity index 100% rename from spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java diff --git a/spring-5-reactive-oauth/src/main/resources/application.yml b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/application.yml similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/application.yml rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/application.yml diff --git a/spring-5-reactive-oauth/src/main/resources/default-application.yml b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/default-application.yml similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/default-application.yml rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/default-application.yml diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties diff --git a/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties b/spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties similarity index 100% rename from spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java similarity index 100% rename from spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java similarity index 100% rename from spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java similarity index 100% rename from spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java diff --git a/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java b/spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java similarity index 100% rename from spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java diff --git a/spring-5-reactive-oauth/src/test/resources/logback-test.xml b/spring-5-reactive-modules/spring-5-reactive-oauth/src/test/resources/logback-test.xml similarity index 100% rename from spring-5-reactive-oauth/src/test/resources/logback-test.xml rename to spring-5-reactive-modules/spring-5-reactive-oauth/src/test/resources/logback-test.xml diff --git a/spring-5-reactive-security/.gitignore b/spring-5-reactive-modules/spring-5-reactive-security/.gitignore similarity index 100% rename from spring-5-reactive-security/.gitignore rename to spring-5-reactive-modules/spring-5-reactive-security/.gitignore diff --git a/spring-5-reactive-security/README.md b/spring-5-reactive-modules/spring-5-reactive-security/README.md similarity index 100% rename from spring-5-reactive-security/README.md rename to spring-5-reactive-modules/spring-5-reactive-security/README.md diff --git a/spring-5-reactive-security/pom.xml b/spring-5-reactive-modules/spring-5-reactive-security/pom.xml similarity index 96% rename from spring-5-reactive-security/pom.xml rename to spring-5-reactive-modules/spring-5-reactive-security/pom.xml index 7b697c7b00..3227fe292c 100644 --- a/spring-5-reactive-security/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive-security/pom.xml @@ -10,10 +10,9 @@ spring 5 security sample project about new features - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java b/spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java similarity index 100% rename from spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java diff --git a/spring-5-reactive-security/src/main/resources/application.properties b/spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/application.properties similarity index 100% rename from spring-5-reactive-security/src/main/resources/application.properties rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/application.properties diff --git a/spring-5-reactive-security/src/main/resources/files/hello.txt b/spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/files/hello.txt similarity index 100% rename from spring-5-reactive-security/src/main/resources/files/hello.txt rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/files/hello.txt diff --git a/spring-5-reactive-security/src/main/resources/files/test/test.txt b/spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/files/test/test.txt similarity index 100% rename from spring-5-reactive-security/src/main/resources/files/test/test.txt rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/files/test/test.txt diff --git a/spring-5-reactive-security/src/main/resources/logback.xml b/spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/logback.xml similarity index 100% rename from spring-5-reactive-security/src/main/resources/logback.xml rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/logback.xml diff --git a/spring-5-reactive-security/src/main/resources/static/client-websocket.html b/spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/static/client-websocket.html similarity index 100% rename from spring-5-reactive-security/src/main/resources/static/client-websocket.html rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/resources/static/client-websocket.html diff --git a/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml b/spring-5-reactive-modules/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml rename to spring-5-reactive-modules/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java diff --git a/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java b/spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java similarity index 100% rename from spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java diff --git a/spring-5-reactive-security/src/test/resources/baeldung-weekly.png b/spring-5-reactive-modules/spring-5-reactive-security/src/test/resources/baeldung-weekly.png similarity index 100% rename from spring-5-reactive-security/src/test/resources/baeldung-weekly.png rename to spring-5-reactive-modules/spring-5-reactive-security/src/test/resources/baeldung-weekly.png diff --git a/spring-5-reactive/.gitignore b/spring-5-reactive-modules/spring-5-reactive/.gitignore similarity index 100% rename from spring-5-reactive/.gitignore rename to spring-5-reactive-modules/spring-5-reactive/.gitignore diff --git a/spring-5-reactive/README.md b/spring-5-reactive-modules/spring-5-reactive/README.md similarity index 100% rename from spring-5-reactive/README.md rename to spring-5-reactive-modules/spring-5-reactive/README.md diff --git a/spring-5-reactive/pom.xml b/spring-5-reactive-modules/spring-5-reactive/pom.xml similarity index 96% rename from spring-5-reactive/pom.xml rename to spring-5-reactive-modules/spring-5-reactive/pom.xml index b9456c7181..eb50f70a6b 100644 --- a/spring-5-reactive/pom.xml +++ b/spring-5-reactive-modules/spring-5-reactive/pom.xml @@ -10,10 +10,9 @@ spring 5 sample project about new features - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-5-reactive/src/main/assets/index.html b/spring-5-reactive-modules/spring-5-reactive/src/main/assets/index.html similarity index 100% rename from spring-5-reactive/src/main/assets/index.html rename to spring-5-reactive-modules/spring-5-reactive/src/main/assets/index.html diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/Actor.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/Actor.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/Actor.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/Actor.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/IndexRewriteFilter.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/IndexRewriteFilter.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/IndexRewriteFilter.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/IndexRewriteFilter.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/FooReactiveController.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/FooReactiveController.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/controller/FooReactiveController.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/FooReactiveController.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java similarity index 96% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java index f5a5d9e769..3c9cb812f2 100644 --- a/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java +++ b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/controller/PathPatternController.java @@ -1,39 +1,39 @@ -package com.baeldung.reactive.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class PathPatternController { - - @GetMapping("/spring5/{*id}") - public String URIVariableHandler(@PathVariable String id) { - return id; - } - - @GetMapping("/s?ring5") - public String wildcardTakingExactlyOneChar() { - return "/s?ring5"; - } - - @GetMapping("/spring5/*id") - public String wildcardTakingZeroOrMoreChar() { - return "/spring5/*id"; - } - - @GetMapping("/resources/**") - public String wildcardTakingZeroOrMorePathSegments() { - return "/resources/**"; - } - - @GetMapping("/{baeldung:[a-z]+}") - public String regexInPathVariable(@PathVariable String baeldung) { - return baeldung; - } - - @GetMapping("/{var1}_{var2}") - public String multiplePathVariablesInSameSegment(@PathVariable String var1, @PathVariable String var2) { - return "Two variables are var1=" + var1 + " and var2=" + var2; - } -} +package com.baeldung.reactive.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class PathPatternController { + + @GetMapping("/spring5/{*id}") + public String URIVariableHandler(@PathVariable String id) { + return id; + } + + @GetMapping("/s?ring5") + public String wildcardTakingExactlyOneChar() { + return "/s?ring5"; + } + + @GetMapping("/spring5/*id") + public String wildcardTakingZeroOrMoreChar() { + return "/spring5/*id"; + } + + @GetMapping("/resources/**") + public String wildcardTakingZeroOrMorePathSegments() { + return "/resources/**"; + } + + @GetMapping("/{baeldung:[a-z]+}") + public String regexInPathVariable(@PathVariable String baeldung) { + return baeldung; + } + + @GetMapping("/{var1}_{var2}") + public String multiplePathVariablesInSameSegment(@PathVariable String var1, @PathVariable String var2) { + return "Two variables are var1=" + var1 + " and var2=" + var2; + } +} diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/UserController.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/UserController.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/filters/UserController.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/filters/UserController.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/model/Foo.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/model/Foo.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/model/Foo.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/model/Foo.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/controllers/ResponseHeaderController.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/controllers/ResponseHeaderController.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/controllers/ResponseHeaderController.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/controllers/ResponseHeaderController.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/filter/AddResponseHeaderWebFilter.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/filter/AddResponseHeaderWebFilter.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/filter/AddResponseHeaderWebFilter.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/filter/AddResponseHeaderWebFilter.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/handlers/ResponseHeaderHandler.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/handlers/ResponseHeaderHandler.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/handlers/ResponseHeaderHandler.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/handlers/ResponseHeaderHandler.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/routers/ResponseHeadersRouterFunctions.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/routers/ResponseHeadersRouterFunctions.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/routers/ResponseHeadersRouterFunctions.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/responseheaders/functional/routers/ResponseHeadersRouterFunctions.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/Actor.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/Actor.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/Actor.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/Actor.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/IndexRewriteFilter.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/IndexRewriteFilter.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/IndexRewriteFilter.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/IndexRewriteFilter.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/Application.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/Application.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/Application.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/Application.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/RedisConfig.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/RedisConfig.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/configuration/RedisConfig.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/RedisConfig.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/SessionConfig.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/SessionConfig.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/configuration/SessionConfig.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/SessionConfig.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxConfig.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxConfig.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxConfig.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxConfig.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/controller/SessionController.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/controller/SessionController.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/controller/SessionController.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/controller/SessionController.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websession/transfer/CustomResponse.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/transfer/CustomResponse.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websession/transfer/CustomResponse.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websession/transfer/CustomResponse.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websocket/Event.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/Event.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websocket/Event.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/Event.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveJavaClientWebSocket.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveJavaClientWebSocket.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveJavaClientWebSocket.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveJavaClientWebSocket.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketApplication.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketApplication.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketApplication.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketApplication.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketConfiguration.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketConfiguration.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketConfiguration.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketConfiguration.java diff --git a/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketHandler.java b/spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketHandler.java similarity index 100% rename from spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketHandler.java rename to spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/ReactiveWebSocketHandler.java diff --git a/spring-5-reactive/src/main/resources/application.properties b/spring-5-reactive-modules/spring-5-reactive/src/main/resources/application.properties similarity index 100% rename from spring-5-reactive/src/main/resources/application.properties rename to spring-5-reactive-modules/spring-5-reactive/src/main/resources/application.properties diff --git a/spring-5-reactive/src/main/resources/files/hello.txt b/spring-5-reactive-modules/spring-5-reactive/src/main/resources/files/hello.txt similarity index 100% rename from spring-5-reactive/src/main/resources/files/hello.txt rename to spring-5-reactive-modules/spring-5-reactive/src/main/resources/files/hello.txt diff --git a/spring-5-reactive/src/main/resources/files/test/test.txt b/spring-5-reactive-modules/spring-5-reactive/src/main/resources/files/test/test.txt similarity index 100% rename from spring-5-reactive/src/main/resources/files/test/test.txt rename to spring-5-reactive-modules/spring-5-reactive/src/main/resources/files/test/test.txt diff --git a/spring-5-reactive/src/main/resources/logback.xml b/spring-5-reactive-modules/spring-5-reactive/src/main/resources/logback.xml similarity index 100% rename from spring-5-reactive/src/main/resources/logback.xml rename to spring-5-reactive-modules/spring-5-reactive/src/main/resources/logback.xml diff --git a/spring-5-reactive/src/main/resources/static/client-websocket.html b/spring-5-reactive-modules/spring-5-reactive/src/main/resources/static/client-websocket.html similarity index 100% rename from spring-5-reactive/src/main/resources/static/client-websocket.html rename to spring-5-reactive-modules/spring-5-reactive/src/main/resources/static/client-websocket.html diff --git a/spring-5-reactive/src/main/webapp/WEB-INF/web.xml b/spring-5-reactive-modules/spring-5-reactive/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-5-reactive/src/main/webapp/WEB-INF/web.xml rename to spring-5-reactive-modules/spring-5-reactive/src/main/webapp/WEB-INF/web.xml diff --git a/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/FluxUnitTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/FluxUnitTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/FluxUnitTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/FluxUnitTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/responseheaders/ResponseHeaderLiveTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/responseheaders/ResponseHeaderLiveTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/responseheaders/ResponseHeaderLiveTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/responseheaders/ResponseHeaderLiveTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java b/spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java similarity index 100% rename from spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java rename to spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java diff --git a/spring-5-reactive/src/test/resources/baeldung-weekly.png b/spring-5-reactive-modules/spring-5-reactive/src/test/resources/baeldung-weekly.png similarity index 100% rename from spring-5-reactive/src/test/resources/baeldung-weekly.png rename to spring-5-reactive-modules/spring-5-reactive/src/test/resources/baeldung-weekly.png diff --git a/spring-reactive/README.md b/spring-5-reactive-modules/spring-reactive/README.md similarity index 100% rename from spring-reactive/README.md rename to spring-5-reactive-modules/spring-reactive/README.md diff --git a/spring-reactive/pom.xml b/spring-5-reactive-modules/spring-reactive/pom.xml similarity index 94% rename from spring-reactive/pom.xml rename to spring-5-reactive-modules/spring-reactive/pom.xml index 396fa3ee4a..a6ae5eac5b 100644 --- a/spring-reactive/pom.xml +++ b/spring-5-reactive-modules/spring-reactive/pom.xml @@ -6,10 +6,9 @@ spring-reactive - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.reactive + spring-5-reactive-modules + 1.0.0-SNAPSHOT diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Application.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Application.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Application.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Application.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Controller.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Controller.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Controller.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Controller.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Person.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Person.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Person.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/Person.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/PersonRepository.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/PersonRepository.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/concurrency/PersonRepository.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/concurrency/PersonRepository.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/ConsumerDebuggingApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/ConsumerDebuggingApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/ConsumerDebuggingApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/ConsumerDebuggingApplication.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/controllers/ReactiveConfigsToggleRestController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/controllers/ReactiveConfigsToggleRestController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/controllers/ReactiveConfigsToggleRestController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/controllers/ReactiveConfigsToggleRestController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/cronjobs/CronJobs.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/cronjobs/CronJobs.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/cronjobs/CronJobs.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/cronjobs/CronJobs.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/Foo.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/Foo.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/Foo.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/Foo.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/FooDto.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/FooDto.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/FooDto.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/model/FooDto.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooNameHelper.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooNameHelper.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooNameHelper.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooNameHelper.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooQuantityHelper.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooQuantityHelper.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooQuantityHelper.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooQuantityHelper.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooReporter.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooReporter.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooReporter.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooReporter.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooService.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooService.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooService.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/consumer/service/FooService.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/ServerDebuggingApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/ServerDebuggingApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/ServerDebuggingApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/ServerDebuggingApplication.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/handlers/ServerHandler.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/handlers/ServerHandler.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/handlers/ServerHandler.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/handlers/ServerHandler.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/model/Foo.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/model/Foo.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/model/Foo.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/model/Foo.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/routers/ServerRouter.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/routers/ServerRouter.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/routers/ServerRouter.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/debugging/server/routers/ServerRouter.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/ErrorHandlingApplication.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/NameRequiredException.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/NameRequiredException.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/NameRequiredException.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/NameRequiredException.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Foo.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Foo.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/Foo.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Foo.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Tweet.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Tweet.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/Tweet.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/Tweet.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/TweetsSlowServiceController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/TweetsSlowServiceController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/TweetsSlowServiceController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/TweetsSlowServiceController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientApplication.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebClientController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclient/WebController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webclientrequests/SpringWebClientRequestsApp.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclientrequests/SpringWebClientRequestsApp.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webclientrequests/SpringWebClientRequestsApp.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webclientrequests/SpringWebClientRequestsApp.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeSpringApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeSpringApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeSpringApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeSpringApplication.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebClient.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebClient.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebClient.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebClient.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebSecurityConfig.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebSecurityConfig.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebSecurityConfig.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeWebSecurityConfig.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeFunctionalConfig.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeFunctionalConfig.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeFunctionalConfig.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeFunctionalConfig.java diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalApplication.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalApplication.java similarity index 100% rename from spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalApplication.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalApplication.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceLiveTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceLiveTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceLiveTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/ConsumerFooServiceLiveTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/utils/ListAppender.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/utils/ListAppender.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/utils/ListAppender.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/debugging/consumer/utils/ListAppender.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/introduction/ReactorIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/introduction/ReactorIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/introduction/ReactorIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/introduction/ReactorIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webclient/SpringContextTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/SpringContextTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webclient/SpringContextTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/SpringContextTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebClientIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebClientIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebClientIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebClientIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebControllerIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebControllerIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebControllerIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebControllerIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebTestClientIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebTestClientIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebTestClientIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclient/WebTestClientIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webclientrequests/WebClientRequestsWithParametersUnitTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclientrequests/WebClientRequestsWithParametersUnitTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webclientrequests/WebClientRequestsWithParametersUnitTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webclientrequests/WebClientRequestsWithParametersUnitTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webflux/annotation/EmployeeControllerIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webflux/annotation/EmployeeControllerIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webflux/annotation/EmployeeControllerIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webflux/annotation/EmployeeControllerIntegrationTest.java diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalIntegrationTest.java b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalIntegrationTest.java similarity index 100% rename from spring-reactive/src/test/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalIntegrationTest.java rename to spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/webflux/functional/EmployeeSpringFunctionalIntegrationTest.java diff --git a/spring-reactive/src/test/resources/logback-test.xml b/spring-5-reactive-modules/spring-reactive/src/test/resources/logback-test.xml similarity index 100% rename from spring-reactive/src/test/resources/logback-test.xml rename to spring-5-reactive-modules/spring-reactive/src/test/resources/logback-test.xml From 263f0b1adda38876c219c1ae5806365fb94ddf36 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Mon, 20 Jun 2022 17:46:21 +0530 Subject: [PATCH 24/86] Update README.md (#12389) --- spring-5-reactive-modules/spring-5-reactive/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-5-reactive-modules/spring-5-reactive/README.md b/spring-5-reactive-modules/spring-5-reactive/README.md index 0f4756c53e..05a748ca26 100644 --- a/spring-5-reactive-modules/spring-5-reactive/README.md +++ b/spring-5-reactive-modules/spring-5-reactive/README.md @@ -12,4 +12,4 @@ The "REST With Spring" Classes: https://bit.ly/restwithspring - [Spring Webflux Filters](https://www.baeldung.com/spring-webflux-filters) - [How to Set a Header on a Response with Spring 5](https://www.baeldung.com/spring-response-header) - [A Guide to Spring Session Reactive Support: WebSession](https://www.baeldung.com/spring-session-reactive) -- More articles: [[next -->]](/spring-5-reactive-2) +- More articles: [[next -->]](/spring-5-reactive-modules/spring-5-reactive-2) From 3e0c28d1edc2ed816fa5e239a7c9a51a14b80f94 Mon Sep 17 00:00:00 2001 From: freelansam <79205526+freelansam@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:34:22 +0530 Subject: [PATCH 25/86] JAVA-4493: Add missing live test for Consumer Driven Contracts article (#12362) * JAVA-4493: Add missing live test for Consumer Driven Contracts article * JAVA-4493: Add missing live test for Consumer Driven Contracts article --- libraries-5/pom.xml | 21 +++-- .../baeldung/pact/config/MainApplication.java | 15 ++++ .../pact}/web/controller/PactController.java | 4 +- .../com/baeldung/pact}/web/dto/PactDto.java | 2 +- .../src/main/resources/application.properties | 2 + .../PactConsumerDrivenContractUnitTest.java | 67 +++++++--------- .../baeldung/pact/PactProviderLiveTest.java | 2 +- .../PactConsumerDrivenContractUnitTest.java | 76 ------------------- 8 files changed, 62 insertions(+), 127 deletions(-) create mode 100644 libraries-5/src/main/java/com/baeldung/pact/config/MainApplication.java rename {spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp => libraries-5/src/main/java/com/baeldung/pact}/web/controller/PactController.java (90%) rename {spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp => libraries-5/src/main/java/com/baeldung/pact}/web/dto/PactDto.java (93%) create mode 100644 libraries-5/src/main/resources/application.properties rename {spring-web-modules/spring-resttemplate => libraries-5}/src/test/java/com/baeldung/pact/PactProviderLiveTest.java (96%) delete mode 100644 spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml index 63d1924852..85b1f3b475 100644 --- a/libraries-5/pom.xml +++ b/libraries-5/pom.xml @@ -6,16 +6,16 @@ libraries-5 - parent-modules com.baeldung - 1.0.0-SNAPSHOT + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 org.springframework spring-web - ${spring.version} org.jooq @@ -24,10 +24,19 @@ au.com.dius - pact-jvm-consumer-junit_2.11 + pact-jvm-provider-junit5_2.12 + ${pact.version} + + + au.com.dius + pact-jvm-consumer-junit5_2.12 ${pact.version} test + + org.springframework.boot + spring-boot-starter-web + com.typesafe.akka @@ -111,10 +120,10 @@ - 3.5.0 + 3.6.3 0.9.12 4.3.8.RELEASE - 2.11 + 2.12 2.5.11 0.6.5 3.0.14 diff --git a/libraries-5/src/main/java/com/baeldung/pact/config/MainApplication.java b/libraries-5/src/main/java/com/baeldung/pact/config/MainApplication.java new file mode 100644 index 0000000000..b8a92e4742 --- /dev/null +++ b/libraries-5/src/main/java/com/baeldung/pact/config/MainApplication.java @@ -0,0 +1,15 @@ +package com.baeldung.pact.config; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@EnableAutoConfiguration +@ComponentScan("com.baeldung.pact") +public class MainApplication implements WebMvcConfigurer { + + public static void main(final String[] args) { + SpringApplication.run(MainApplication.class, args); + } +} \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/PactController.java b/libraries-5/src/main/java/com/baeldung/pact/web/controller/PactController.java similarity index 90% rename from spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/PactController.java rename to libraries-5/src/main/java/com/baeldung/pact/web/controller/PactController.java index 0f5d7f1acb..d38f4dceb2 100644 --- a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/PactController.java +++ b/libraries-5/src/main/java/com/baeldung/pact/web/controller/PactController.java @@ -1,4 +1,4 @@ -package com.baeldung.sampleapp.web.controller; +package com.baeldung.pact.web.controller; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import com.baeldung.sampleapp.web.dto.PactDto; +import com.baeldung.pact.web.dto.PactDto; @RestController public class PactController { diff --git a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/dto/PactDto.java b/libraries-5/src/main/java/com/baeldung/pact/web/dto/PactDto.java similarity index 93% rename from spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/dto/PactDto.java rename to libraries-5/src/main/java/com/baeldung/pact/web/dto/PactDto.java index e184119611..1525f23478 100644 --- a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/dto/PactDto.java +++ b/libraries-5/src/main/java/com/baeldung/pact/web/dto/PactDto.java @@ -1,4 +1,4 @@ -package com.baeldung.sampleapp.web.dto; +package com.baeldung.pact.web.dto; public class PactDto { diff --git a/libraries-5/src/main/resources/application.properties b/libraries-5/src/main/resources/application.properties new file mode 100644 index 0000000000..1a26e3ad99 --- /dev/null +++ b/libraries-5/src/main/resources/application.properties @@ -0,0 +1,2 @@ +server.port=8082 +server.servlet.context-path=/spring-rest \ No newline at end of file diff --git a/libraries-5/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java b/libraries-5/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java index 8d4918a3e7..6e8703be0d 100644 --- a/libraries-5/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java +++ b/libraries-5/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java @@ -1,46 +1,31 @@ package com.baeldung.pact; -import au.com.dius.pact.consumer.Pact; -import au.com.dius.pact.consumer.PactProviderRuleMk2; -import au.com.dius.pact.consumer.PactVerification; -import au.com.dius.pact.consumer.dsl.PactDslWithProvider; -import au.com.dius.pact.model.RequestResponsePact; -import org.junit.Rule; -import org.junit.Test; -import org.springframework.http.*; -import org.springframework.web.client.RestTemplate; - -import java.io.IOException; -import java.net.ServerSocket; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; - import static org.assertj.core.api.Assertions.assertThat; +import java.util.HashMap; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; + +import au.com.dius.pact.consumer.MockServer; +import au.com.dius.pact.consumer.Pact; +import au.com.dius.pact.consumer.dsl.PactDslWithProvider; +import au.com.dius.pact.consumer.junit5.PactConsumerTestExt; +import au.com.dius.pact.consumer.junit5.PactTestFor; +import au.com.dius.pact.model.RequestResponsePact; + +@ExtendWith(PactConsumerTestExt.class) +@PactTestFor(providerName = "test_provider", hostInterface="localhost") public class PactConsumerDrivenContractUnitTest { - private static int getAvailablePort() { - return new Random() - .ints(6000, 9000) - .filter(PactConsumerDrivenContractUnitTest::isFree) - .findFirst() - .orElse(8080); - } - - private static boolean isFree(int port) { - try { - new ServerSocket(port).close(); - return true; - } catch (IOException e) { - return false; - } - } - - @Rule - public PactProviderRuleMk2 mockProvider = new PactProviderRuleMk2("test_provider", "localhost", getAvailablePort(), this); - - @Pact(consumer = "test_consumer") + @Pact(provider="test_provider", consumer = "test_consumer") public RequestResponsePact createPact(PactDslWithProvider builder) { Map headers = new HashMap<>(); headers.put("Content-Type", "application/json"); @@ -66,10 +51,10 @@ public class PactConsumerDrivenContractUnitTest { } @Test - @PactVerification() - public void givenGet_whenSendRequest_shouldReturn200WithProperHeaderAndBody() { + @PactTestFor + void givenGet_whenSendRequest_shouldReturn200WithProperHeaderAndBody(MockServer mockServer) { // when - ResponseEntity response = new RestTemplate().getForEntity(mockProvider.getUrl() + "/pact", String.class); + ResponseEntity response = new RestTemplate().getForEntity(mockServer.getUrl() + "/pact", String.class); // then assertThat(response.getStatusCode().value()).isEqualTo(200); @@ -82,7 +67,7 @@ public class PactConsumerDrivenContractUnitTest { String jsonBody = "{\"name\": \"Michael\"}"; // when - ResponseEntity postResponse = new RestTemplate().exchange(mockProvider.getUrl() + "/pact", HttpMethod.POST, new HttpEntity<>(jsonBody, httpHeaders), String.class); + ResponseEntity postResponse = new RestTemplate().exchange(mockServer.getUrl() + "/pact", HttpMethod.POST, new HttpEntity<>(jsonBody, httpHeaders), String.class); // then assertThat(postResponse.getStatusCode().value()).isEqualTo(201); diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactProviderLiveTest.java b/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java similarity index 96% rename from spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactProviderLiveTest.java rename to libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java index c59a4ea59f..7b72dec852 100644 --- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactProviderLiveTest.java +++ b/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringApplication; import org.springframework.web.context.ConfigurableWebApplicationContext; -import com.baeldung.sampleapp.config.MainApplication; +import com.baeldung.pact.config.MainApplication; import au.com.dius.pact.provider.junit.Provider; import au.com.dius.pact.provider.junit.State; diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java deleted file mode 100644 index 6e8703be0d..0000000000 --- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/pact/PactConsumerDrivenContractUnitTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.baeldung.pact; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.HashMap; -import java.util.Map; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.client.RestTemplate; - -import au.com.dius.pact.consumer.MockServer; -import au.com.dius.pact.consumer.Pact; -import au.com.dius.pact.consumer.dsl.PactDslWithProvider; -import au.com.dius.pact.consumer.junit5.PactConsumerTestExt; -import au.com.dius.pact.consumer.junit5.PactTestFor; -import au.com.dius.pact.model.RequestResponsePact; - -@ExtendWith(PactConsumerTestExt.class) -@PactTestFor(providerName = "test_provider", hostInterface="localhost") -public class PactConsumerDrivenContractUnitTest { - - @Pact(provider="test_provider", consumer = "test_consumer") - public RequestResponsePact createPact(PactDslWithProvider builder) { - Map headers = new HashMap<>(); - headers.put("Content-Type", "application/json"); - - return builder - .given("test GET") - .uponReceiving("GET REQUEST") - .path("/pact") - .method("GET") - .willRespondWith() - .status(200) - .headers(headers) - .body("{\"condition\": true, \"name\": \"tom\"}") - .given("test POST") - .uponReceiving("POST REQUEST") - .method("POST") - .headers(headers) - .body("{\"name\": \"Michael\"}") - .path("/pact") - .willRespondWith() - .status(201) - .toPact(); - } - - @Test - @PactTestFor - void givenGet_whenSendRequest_shouldReturn200WithProperHeaderAndBody(MockServer mockServer) { - // when - ResponseEntity response = new RestTemplate().getForEntity(mockServer.getUrl() + "/pact", String.class); - - // then - assertThat(response.getStatusCode().value()).isEqualTo(200); - assertThat(response.getHeaders().get("Content-Type").contains("application/json")).isTrue(); - assertThat(response.getBody()).contains("condition", "true", "name", "tom"); - - // and - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.setContentType(MediaType.APPLICATION_JSON); - String jsonBody = "{\"name\": \"Michael\"}"; - - // when - ResponseEntity postResponse = new RestTemplate().exchange(mockServer.getUrl() + "/pact", HttpMethod.POST, new HttpEntity<>(jsonBody, httpHeaders), String.class); - - // then - assertThat(postResponse.getStatusCode().value()).isEqualTo(201); - } - -} From 033ddb7a415e8b1b179508e04ed18c87204e5338 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Mon, 20 Jun 2022 18:46:31 +0530 Subject: [PATCH 26/86] JAVA-11382 Update article Create an empty map in Java (#12383) --- .../com/baeldung/maps/initialize/EmptyMapInitializer.java | 7 ++++++- .../maps/initialize/EmptyMapInitializerUnitTest.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/maps/initialize/EmptyMapInitializer.java b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/maps/initialize/EmptyMapInitializer.java index 3dc644f1af..78819cc21e 100644 --- a/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/maps/initialize/EmptyMapInitializer.java +++ b/core-java-modules/core-java-collections-4/src/main/java/com/baeldung/maps/initialize/EmptyMapInitializer.java @@ -32,7 +32,7 @@ public class EmptyMapInitializer { return emptyMap; } - public Map createGenericEmptyMapUsingMapsObject() { + public Map createGenericEmptyMapUsingGuavaMapsObject() { Map genericEmptyMap = Maps.newHashMap(); return genericEmptyMap; } @@ -43,6 +43,11 @@ public class EmptyMapInitializer { return emptyMapUsingGuava; } + public static Map createImmutableMapUsingGuava() { + Map emptyImmutableMapUsingGuava = ImmutableMap.of(); + return emptyImmutableMapUsingGuava; + } + public SortedMap createEmptySortedMap() { SortedMap sortedMap = Collections.emptySortedMap(); return sortedMap; diff --git a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/maps/initialize/EmptyMapInitializerUnitTest.java b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/maps/initialize/EmptyMapInitializerUnitTest.java index cc25205ba7..57183734cb 100644 --- a/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/maps/initialize/EmptyMapInitializerUnitTest.java +++ b/core-java-modules/core-java-collections-4/src/test/java/com/baeldung/maps/initialize/EmptyMapInitializerUnitTest.java @@ -28,4 +28,9 @@ public class EmptyMapInitializerUnitTest { assertFalse(emptyMapUsingGuava.isEmpty()); } + @Test(expected=UnsupportedOperationException.class) + public void givenImmutableEmptyMapUsingGuava_whenAddingEntries_throwsException() { + Map map = EmptyMapInitializer.createImmutableMapUsingGuava(); + map.put("key", "value"); + } } From 02c9bdff35fedb9c480dbc9af1ba2feb73205863 Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Mon, 20 Jun 2022 14:18:59 +0100 Subject: [PATCH 27/86] Java 11498 (#12382) * added parent lombok-modules * added lombok submodule to parent lombok-modules * added lombok-2 submodule to parent lombok-modules * added lombok-custom submodule to parent lombok-modules * delete lombok submodules that were moved across Co-authored-by: panagiotiskakos --- lombok-modules/README.md | 3 + .../lombok-2}/README.md | 0 .../lombok-2}/lombok.config | 0 {lombok-2 => lombok-modules/lombok-2}/pom.xml | 2 +- .../lombok/accessors/model/BasicAccount.java | 0 .../accessors/model/ChainedAccount.java | 0 .../accessors/model/ChainedFluentAccount.java | 0 .../lombok/accessors/model/FluentAccount.java | 0 .../accessors/model/PrefixedAccount.java | 0 .../model/PrefixedFluentAccount.java | 0 .../accessors/model/StandardAccount.java | 0 .../com/baeldung/lombok/tostring/Account.java | 0 .../baeldung/lombok/tostring/AccountType.java | 0 .../lombok/tostring/RewardAccount.java | 0 .../lombok/tostring/SavingAccount.java | 0 .../baeldung/lombok/valvar/ValExample.java | 0 .../baeldung/lombok/valvar/VarExample.java | 0 .../com/baeldung/lombok/valvar/lombok.config | 0 .../java/com/baeldung/lombok/with/Device.java | 0 .../java/com/baeldung/lombok/with/Holder.java | 0 .../baeldung/lombok/with/ImprovedUser.java | 0 .../com/baeldung/lombok/with/KioskDevice.java | 0 .../java/com/baeldung/lombok/with/Stock.java | 0 .../java/com/baeldung/lombok/with/User.java | 0 .../lombok-2}/src/main/resources/logback.xml | 0 .../lombok/accessors/AccessorsUnitTest.java | 0 .../lombok/tostring/ToStringUnitTest.java | 0 .../lombok/valvar/ValExampleUnitTest.java | 0 .../lombok/valvar/VarExampleUnitTest.java | 0 .../baeldung/lombok/with/HolderUnitTest.java | 0 .../lombok/with/ImprovedUserUnitTest.java | 0 .../lombok/with/KioskDeviceWithUnitTest.java | 0 .../lombok/with/StockWithUnitTest.java | 0 .../lombok/with/UserWithUnitTest.java | 0 .../lombok-custom}/README.md | 0 .../lombok-custom}/pom.xml | 2 +- .../com/baeldung/singleton/Singleton.java | 0 .../handlers/SingletonEclipseHandler.java | 0 .../handlers/SingletonJavacHandler.java | 0 {lombok => lombok-modules/lombok}/README.md | 0 .../lombok}/lombok.config | 0 .../lombok}/lombok_feature.config | 0 {lombok => lombok-modules/lombok}/pom.xml | 2 +- .../lombok/builder/ClientBuilder.java | 0 .../lombok/builder/ImmutableClient.java | 0 .../builder/RequiredFieldAnnotation.java | 0 .../com/baeldung/lombok/builder/Widget.java | 0 .../lombok/builder/customsetter/Message.java | 0 .../lombok/builder/defaultvalue/Pojo.java | 0 .../inheritance/buildermethodname/Child.java | 0 .../inheritance/buildermethodname/Parent.java | 0 .../buildermethodname/Student.java | 0 .../inheritance/superbuilder/Child.java | 0 .../inheritance/superbuilder/Parent.java | 0 .../inheritance/superbuilder/Student.java | 0 .../lombok/builder/singular/Person.java | 0 .../baeldung/lombok/builder/singular/Sea.java | 0 .../lombok/configexamples/Account.java | 0 .../lombok/configexamples/TransactionLog.java | 0 .../lombok/configexamples/lombok.config | 0 .../baeldung/lombok/exclusions/Employee.java | 0 .../com/baeldung/lombok/exclusions/User.java | 0 .../baeldung/lombok/getter/GetterBoolean.java | 30 ++++---- .../lombok/getter/GetterBooleanPrimitive.java | 32 ++++----- .../GetterBooleanPrimitiveSameAccessor.java | 36 +++++----- .../getter/GetterBooleanSameAccessor.java | 26 +++---- .../lombok/getter/GetterBooleanType.java | 30 ++++---- .../lombok/intro/ApiClientConfiguration.java | 0 .../baeldung/lombok/intro/ClientBuilder.java | 0 .../intro/ContactInformationSupport.java | 0 .../com/baeldung/lombok/intro/GetterLazy.java | 0 .../lombok/intro/HasContactInformation.java | 0 .../lombok/intro/ImmutableClient.java | 0 .../baeldung/lombok/intro/LoginResult.java | 0 .../java/com/baeldung/lombok/intro/User.java | 0 .../com/baeldung/lombok/intro/UserEvent.java | 0 .../com/baeldung/lombok/intro/Utility.java | 0 .../lombok}/src/main/resources/logback.xml | 0 .../src/main/resources/sure_in_my_jar.txt | 0 .../lombok/builder/BuilderUnitTest.java | 0 .../RequiredFieldAnnotationUnitTest.java | 0 .../BuilderWithCustomSetterUnitTest.java | 0 .../BuilderWithDefaultValueUnitTest.java | 0 ...derInheritanceUsingMethodNameUnitTest.java | 0 ...rInheritanceUsingSuperBuilderUnitTest.java | 0 ...SingularSupportForCollectionsUnitTest.java | 0 .../configexamples/AccountUnitTest.java | 0 .../lombok/getter/GetterBooleanUnitTest.java | 68 +++++++++---------- ...ApiClientConfigurationIntegrationTest.java | 0 .../lombok/intro/BuilderMethodUnitTest.java | 0 .../lombok/intro/LoginResultLiveTest.java | 0 .../lombok/intro/UserIntegrationTest.java | 0 lombok-modules/pom.xml | 39 +++++++++++ pom.xml | 8 +-- 94 files changed, 158 insertions(+), 120 deletions(-) create mode 100644 lombok-modules/README.md rename {lombok-2 => lombok-modules/lombok-2}/README.md (100%) rename {lombok-2 => lombok-modules/lombok-2}/lombok.config (100%) rename {lombok-2 => lombok-modules/lombok-2}/pom.xml (92%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/tostring/Account.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/tostring/AccountType.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/valvar/ValExample.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/valvar/VarExample.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/valvar/lombok.config (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/Device.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/Holder.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/ImprovedUser.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/KioskDevice.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/Stock.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/java/com/baeldung/lombok/with/User.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/main/resources/logback.xml (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java (100%) rename {lombok-2 => lombok-modules/lombok-2}/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java (100%) rename {lombok-custom => lombok-modules/lombok-custom}/README.md (100%) rename {lombok-custom => lombok-modules/lombok-custom}/pom.xml (97%) rename {lombok-custom => lombok-modules/lombok-custom}/src/main/java/com/baeldung/singleton/Singleton.java (100%) rename {lombok-custom => lombok-modules/lombok-custom}/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java (100%) rename {lombok-custom => lombok-modules/lombok-custom}/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java (100%) rename {lombok => lombok-modules/lombok}/README.md (100%) rename {lombok => lombok-modules/lombok}/lombok.config (100%) rename {lombok => lombok-modules/lombok}/lombok_feature.config (100%) rename {lombok => lombok-modules/lombok}/pom.xml (98%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/Widget.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/singular/Person.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/builder/singular/Sea.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/configexamples/Account.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/configexamples/lombok.config (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/exclusions/Employee.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/exclusions/User.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java (93%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java (93%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java (94%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java (95%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java (93%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/GetterLazy.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/LoginResult.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/User.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/UserEvent.java (100%) rename {lombok => lombok-modules/lombok}/src/main/java/com/baeldung/lombok/intro/Utility.java (100%) rename {lombok => lombok-modules/lombok}/src/main/resources/logback.xml (100%) rename {lombok => lombok-modules/lombok}/src/main/resources/sure_in_my_jar.txt (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java (97%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java (100%) rename {lombok => lombok-modules/lombok}/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java (100%) create mode 100644 lombok-modules/pom.xml diff --git a/lombok-modules/README.md b/lombok-modules/README.md new file mode 100644 index 0000000000..b5a222b439 --- /dev/null +++ b/lombok-modules/README.md @@ -0,0 +1,3 @@ +## Project Lombok + +This module contains modules about project lombok \ No newline at end of file diff --git a/lombok-2/README.md b/lombok-modules/lombok-2/README.md similarity index 100% rename from lombok-2/README.md rename to lombok-modules/lombok-2/README.md diff --git a/lombok-2/lombok.config b/lombok-modules/lombok-2/lombok.config similarity index 100% rename from lombok-2/lombok.config rename to lombok-modules/lombok-2/lombok.config diff --git a/lombok-2/pom.xml b/lombok-modules/lombok-2/pom.xml similarity index 92% rename from lombok-2/pom.xml rename to lombok-modules/lombok-2/pom.xml index bde328444e..c92feed739 100644 --- a/lombok-2/pom.xml +++ b/lombok-modules/lombok-2/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + lombok-modules 1.0.0-SNAPSHOT diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/ChainedFluentAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FluentAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/PrefixedFluentAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/StandardAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/Account.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/AccountType.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/RewardAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/tostring/SavingAccount.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/lombok.config diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/Device.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Device.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Holder.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/ImprovedUser.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/KioskDevice.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/Stock.java diff --git a/lombok-2/src/main/java/com/baeldung/lombok/with/User.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/User.java similarity index 100% rename from lombok-2/src/main/java/com/baeldung/lombok/with/User.java rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/with/User.java diff --git a/lombok-2/src/main/resources/logback.xml b/lombok-modules/lombok-2/src/main/resources/logback.xml similarity index 100% rename from lombok-2/src/main/resources/logback.xml rename to lombok-modules/lombok-2/src/main/resources/logback.xml diff --git a/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/tostring/ToStringUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/ValExampleUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/valvar/VarExampleUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/HolderUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/ImprovedUserUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/KioskDeviceWithUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/StockWithUnitTest.java diff --git a/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java similarity index 100% rename from lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/with/UserWithUnitTest.java diff --git a/lombok-custom/README.md b/lombok-modules/lombok-custom/README.md similarity index 100% rename from lombok-custom/README.md rename to lombok-modules/lombok-custom/README.md diff --git a/lombok-custom/pom.xml b/lombok-modules/lombok-custom/pom.xml similarity index 97% rename from lombok-custom/pom.xml rename to lombok-modules/lombok-custom/pom.xml index dc7f0dfec6..c119900c8a 100644 --- a/lombok-custom/pom.xml +++ b/lombok-modules/lombok-custom/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + lombok-modules 1.0.0-SNAPSHOT diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java similarity index 100% rename from lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java similarity index 100% rename from lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java b/lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java similarity index 100% rename from lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java rename to lombok-modules/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java diff --git a/lombok/README.md b/lombok-modules/lombok/README.md similarity index 100% rename from lombok/README.md rename to lombok-modules/lombok/README.md diff --git a/lombok/lombok.config b/lombok-modules/lombok/lombok.config similarity index 100% rename from lombok/lombok.config rename to lombok-modules/lombok/lombok.config diff --git a/lombok/lombok_feature.config b/lombok-modules/lombok/lombok_feature.config similarity index 100% rename from lombok/lombok_feature.config rename to lombok-modules/lombok/lombok_feature.config diff --git a/lombok/pom.xml b/lombok-modules/lombok/pom.xml similarity index 98% rename from lombok/pom.xml rename to lombok-modules/lombok/pom.xml index 24a04783d1..70c5b09bb3 100644 --- a/lombok/pom.xml +++ b/lombok-modules/lombok/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + lombok-modules 1.0.0-SNAPSHOT diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ClientBuilder.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/ImmutableClient.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/RequiredFieldAnnotation.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/Widget.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/Widget.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/defaultvalue/Pojo.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Child.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Parent.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/buildermethodname/Student.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Child.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Parent.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/inheritance/superbuilder/Student.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Person.java diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/builder/singular/Sea.java diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/Account.java diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/TransactionLog.java diff --git a/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/configexamples/lombok.config diff --git a/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/Employee.java diff --git a/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/exclusions/User.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/exclusions/User.java diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java similarity index 93% rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java index 2191396e5d..d3e142a90d 100644 --- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java +++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java @@ -1,15 +1,15 @@ -package com.baeldung.lombok.getter; - - -import lombok.Getter; - -/** - * Related Article Sections: - * 4. Using @Getter on a Boolean Field - * - */ -public class GetterBoolean { - - @Getter - private Boolean running = true; -} +package com.baeldung.lombok.getter; + + +import lombok.Getter; + +/** + * Related Article Sections: + * 4. Using @Getter on a Boolean Field + * + */ +public class GetterBoolean { + + @Getter + private Boolean running = true; +} diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java similarity index 93% rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java index 5601f85b8b..2805ffc34b 100644 --- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java +++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java @@ -1,16 +1,16 @@ -package com.baeldung.lombok.getter; - - -import lombok.Getter; - -/** - * Related Article Sections: - * 3. Using @Getter on a boolean Field - * - */ -public class GetterBooleanPrimitive { - - @Getter - private boolean running; - -} +package com.baeldung.lombok.getter; + + +import lombok.Getter; + +/** + * Related Article Sections: + * 3. Using @Getter on a boolean Field + * + */ +public class GetterBooleanPrimitive { + + @Getter + private boolean running; + +} diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java similarity index 94% rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java index af29a33c20..f3a037bd3b 100644 --- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java +++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java @@ -1,18 +1,18 @@ -package com.baeldung.lombok.getter; - - -import lombok.Getter; - -/** - * Related Article Sections: - * 3.2. Two boolean Fields With the Same Accessor Name - * - */ -public class GetterBooleanPrimitiveSameAccessor { - - @Getter - boolean running = true; - - @Getter - boolean isRunning = false; -} +package com.baeldung.lombok.getter; + + +import lombok.Getter; + +/** + * Related Article Sections: + * 3.2. Two boolean Fields With the Same Accessor Name + * + */ +public class GetterBooleanPrimitiveSameAccessor { + + @Getter + boolean running = true; + + @Getter + boolean isRunning = false; +} diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java similarity index 95% rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java index d972273b71..773351904c 100644 --- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java +++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java @@ -1,13 +1,13 @@ -package com.baeldung.lombok.getter; - -import lombok.Getter; - -/** - * Related Article Sections: - * 3.1. A boolean Field Having the Same Name With Its Accessor - * - */ -public class GetterBooleanSameAccessor { - @Getter - private boolean isRunning = true; -} +package com.baeldung.lombok.getter; + +import lombok.Getter; + +/** + * Related Article Sections: + * 3.1. A boolean Field Having the Same Name With Its Accessor + * + */ +public class GetterBooleanSameAccessor { + @Getter + private boolean isRunning = true; +} diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java similarity index 93% rename from lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java index 0d3b9a928a..3dd77846a3 100644 --- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java +++ b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java @@ -1,15 +1,15 @@ -package com.baeldung.lombok.getter; - - -import lombok.Getter; - -/** - * Related Article Sections: - * 4. Using @Getter on a Boolean Field - * - */ -public class GetterBooleanType { - - @Getter - private Boolean running = true; -} +package com.baeldung.lombok.getter; + + +import lombok.Getter; + +/** + * Related Article Sections: + * 4. Using @Getter on a Boolean Field + * + */ +public class GetterBooleanType { + + @Getter + private Boolean running = true; +} diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ApiClientConfiguration.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ClientBuilder.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ContactInformationSupport.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/GetterLazy.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/HasContactInformation.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/ImmutableClient.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/LoginResult.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/User.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/User.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/User.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/User.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/UserEvent.java diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java b/lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java similarity index 100% rename from lombok/src/main/java/com/baeldung/lombok/intro/Utility.java rename to lombok-modules/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java diff --git a/lombok/src/main/resources/logback.xml b/lombok-modules/lombok/src/main/resources/logback.xml similarity index 100% rename from lombok/src/main/resources/logback.xml rename to lombok-modules/lombok/src/main/resources/logback.xml diff --git a/lombok/src/main/resources/sure_in_my_jar.txt b/lombok-modules/lombok/src/main/resources/sure_in_my_jar.txt similarity index 100% rename from lombok/src/main/resources/sure_in_my_jar.txt rename to lombok-modules/lombok/src/main/resources/sure_in_my_jar.txt diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/BuilderUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/RequiredFieldAnnotationUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/defaultvalue/BuilderWithDefaultValueUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/buildermethodname/BuilderInheritanceUsingMethodNameUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/inheritance/superbuilder/BuilderInheritanceUsingSuperBuilderUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/builder/singular/BuilderWithSingularSupportForCollectionsUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/configexamples/AccountUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java similarity index 97% rename from lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java index 632594d575..79d35129bd 100644 --- a/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java +++ b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java @@ -1,34 +1,34 @@ -package com.baeldung.lombok.getter; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class GetterBooleanUnitTest { - - @Test - public void whenBasicBooleanField_thenMethodNamePrefixedWithIsFollowedByFieldName() { - GetterBooleanPrimitive lombokExamples = new GetterBooleanPrimitive(); - assertFalse(lombokExamples.isRunning()); - } - - @Test - public void whenBooleanFieldPrefixedWithIs_thenMethodNameIsSameAsFieldName() { - GetterBooleanSameAccessor lombokExamples = new GetterBooleanSameAccessor(); - assertTrue(lombokExamples.isRunning()); - } - - @Test - public void whenTwoBooleanFieldsCauseNamingConflict_thenLombokMapsToFirstDeclaredField() { - GetterBooleanPrimitiveSameAccessor lombokExamples = new GetterBooleanPrimitiveSameAccessor(); - assertTrue(lombokExamples.isRunning() == lombokExamples.running); - assertFalse(lombokExamples.isRunning() == lombokExamples.isRunning); - } - - @Test - public void whenFieldOfBooleanType_thenLombokPrefixesMethodWithGetInsteadOfIs() { - GetterBooleanType lombokExamples = new GetterBooleanType(); - assertTrue(lombokExamples.getRunning()); - } -} +package com.baeldung.lombok.getter; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class GetterBooleanUnitTest { + + @Test + public void whenBasicBooleanField_thenMethodNamePrefixedWithIsFollowedByFieldName() { + GetterBooleanPrimitive lombokExamples = new GetterBooleanPrimitive(); + assertFalse(lombokExamples.isRunning()); + } + + @Test + public void whenBooleanFieldPrefixedWithIs_thenMethodNameIsSameAsFieldName() { + GetterBooleanSameAccessor lombokExamples = new GetterBooleanSameAccessor(); + assertTrue(lombokExamples.isRunning()); + } + + @Test + public void whenTwoBooleanFieldsCauseNamingConflict_thenLombokMapsToFirstDeclaredField() { + GetterBooleanPrimitiveSameAccessor lombokExamples = new GetterBooleanPrimitiveSameAccessor(); + assertTrue(lombokExamples.isRunning() == lombokExamples.running); + assertFalse(lombokExamples.isRunning() == lombokExamples.isRunning); + } + + @Test + public void whenFieldOfBooleanType_thenLombokPrefixesMethodWithGetInsteadOfIs() { + GetterBooleanType lombokExamples = new GetterBooleanType(); + assertTrue(lombokExamples.getRunning()); + } +} diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/BuilderMethodUnitTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java b/lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java similarity index 100% rename from lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java rename to lombok-modules/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java diff --git a/lombok-modules/pom.xml b/lombok-modules/pom.xml new file mode 100644 index 0000000000..905199a13c --- /dev/null +++ b/lombok-modules/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + lombok-modules + 1.0.0-SNAPSHOT + lombok-modules + pom + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + + lombok + lombok-2 + lombok-custom + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + 1.18.20 + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a86aa03093..4b96a48fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -475,9 +475,7 @@ libraries-testing linkrest logging-modules - lombok - lombok-2 - lombok-custom + lombok-modules lucene mapstruct @@ -919,9 +917,7 @@ libraries-testing linkrest logging-modules - lombok - lombok-2 - lombok-custom + lombok-modules lucene mapstruct From 675e33fbab993edaab5d45f7c22033a9bc8f67c4 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Mon, 20 Jun 2022 20:55:14 +0530 Subject: [PATCH 28/86] JAVA-12359 Code Review Changes --- .../StringFilenameValidationUtils.java | 2 +- .../StringFilenameValidationUnitTest.java | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java index f79d01e0c2..6721d52d35 100644 --- a/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java +++ b/core-java-modules/core-java-string-operations-3/src/main/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUtils.java @@ -7,7 +7,7 @@ import java.util.Arrays; public class StringFilenameValidationUtils { - public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', ':', '<', '>', '?', '\\', '|'}; + public static final Character[] INVALID_WINDOWS_SPECIFIC_CHARS = {'"', '*', '<', '>', '?', '|'}; public static final Character[] INVALID_UNIX_SPECIFIC_CHARS = {'\000'}; public static final String REGEX_PATTERN = "^[A-za-z0-9.]{1,255}$"; diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index 36b69c2094..3e79458a7c 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -82,16 +82,12 @@ public class StringFilenameValidationUnitTest { @MethodSource("filenamesWithInvalidWindowsChars") public void givenFilenameStringWithInvalidWindowsCharAndIsWindows_whenValidateUsingIO_thenRaiseException( String filename) { - if (!filename.contains(":")) { - assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class) - .extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING) - .containsAnyOf("The system cannot find the path specifie", - "The filename, directory name, or volume label syntax is incorrect"); - if (!filename.contains("\\")) { - assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)) - .isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char"); - } - } + assertThatThrownBy(() -> validateStringFilenameUsingIO(filename)).isInstanceOf(IOException.class) + .extracting(Throwable::getMessage, InstanceOfAssertFactories.STRING) + .containsAnyOf("The system cannot find the path specified", + "The filename, directory name, or volume label syntax is incorrect"); + assertThatThrownBy(() -> validateStringFilenameUsingNIO2(filename)).isInstanceOf(InvalidPathException.class) + .hasMessageContaining("Illegal char"); assertThat(validateStringFilenameUsingContains(filename)).isFalse(); } From 8c3f4fe73c7758e464814326e3100bb77493c308 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Mon, 20 Jun 2022 22:26:52 +0100 Subject: [PATCH 29/86] [JAVA-12842] Fix junit5 module to work with Gradle 7.x --- gradle/README.md | 2 -- gradle/junit5/README.md | 4 ++++ gradle/junit5/build.gradle | 9 ++++----- gradle/junit5/settings.gradle | 1 + gradle/settings.gradle | 1 - 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 gradle/junit5/README.md create mode 100644 gradle/junit5/settings.gradle diff --git a/gradle/README.md b/gradle/README.md index cf002a7114..149da50f92 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -5,7 +5,5 @@ This module contains articles about Gradle ## Relevant articles: - [Introduction to Gradle](https://www.baeldung.com/gradle) - [Writing Custom Gradle Plugins](https://www.baeldung.com/gradle-create-plugin) -- [Creating a Fat Jar in Gradle](https://www.baeldung.com/gradle-fat-jar) - [A Custom Task in Gradle](https://www.baeldung.com/gradle-custom-task) -- [Using JUnit 5 with Gradle](https://www.baeldung.com/junit-5-gradle) - [Dependency Management in Gradle](https://www.baeldung.com/gradle-dependency-management) diff --git a/gradle/junit5/README.md b/gradle/junit5/README.md new file mode 100644 index 0000000000..d25dde4abb --- /dev/null +++ b/gradle/junit5/README.md @@ -0,0 +1,4 @@ +### Relevant Articles: + +- [Using JUnit 5 with Gradle](https://www.baeldung.com/junit-5-gradle) + diff --git a/gradle/junit5/build.gradle b/gradle/junit5/build.gradle index 5f056d8c23..e589541e08 100644 --- a/gradle/junit5/build.gradle +++ b/gradle/junit5/build.gradle @@ -6,15 +6,14 @@ plugins { dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1' - + // Only necessary for JUnit 3 and 4 tests - testCompileOnly 'junit:junit:4.12' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1' - + testCompileOnly 'junit:junit:4.12' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1' } repositories { - jcenter() + mavenCentral() } test { diff --git a/gradle/junit5/settings.gradle b/gradle/junit5/settings.gradle new file mode 100644 index 0000000000..347fc071ad --- /dev/null +++ b/gradle/junit5/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-junit5' diff --git a/gradle/settings.gradle b/gradle/settings.gradle index d1eb10f4d2..aeb462045d 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -4,7 +4,6 @@ include 'greeting-library' include 'greeting-library-java' include 'greeter' include 'gradletaskdemo' -include 'junit5' include 'gradle-employee-app' include 'gradle-source-vs-target-compatibility' From 2eda1aecd5f73711f5b51f3dc2e8cb61b37bb4b6 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:13:13 +0500 Subject: [PATCH 30/86] Updated README.md added link back to the article: https://www.baeldung.com/java-calculate-time-ago --- core-java-modules/core-java-date-operations-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-date-operations-2/README.md b/core-java-modules/core-java-date-operations-2/README.md index 056c91e60d..e49da29db4 100644 --- a/core-java-modules/core-java-date-operations-2/README.md +++ b/core-java-modules/core-java-date-operations-2/README.md @@ -12,4 +12,5 @@ This module contains articles about date operations in Java. - [Finding Leap Years in Java](https://www.baeldung.com/java-leap-year) - [Getting the Week Number From Any Date](https://www.baeldung.com/java-get-week-number) - [Subtract Days from a Date in Java](https://www.baeldung.com/java-subtract-days-from-date) +- [How to Calculate “Time Ago” in Java](https://www.baeldung.com/java-calculate-time-ago) - [[<-- Prev]](/core-java-modules/core-java-date-operations-1) From d6cbf68489cf805bcead844d5f7cdab2b05aa0ae Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:15:44 +0500 Subject: [PATCH 31/86] Updated README.md added link back to the article: https://www.baeldung.com/java-destructor --- core-java-modules/core-java-9/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md index 0fe2b857a4..38965d88f1 100644 --- a/core-java-modules/core-java-9/README.md +++ b/core-java-modules/core-java-9/README.md @@ -12,3 +12,4 @@ This module contains articles about Java 9 core features - [Easy Ways to Write a Java InputStream to an OutputStream](https://www.baeldung.com/java-inputstream-to-outputstream) - [Private Methods in Java Interfaces](https://www.baeldung.com/java-interface-private-methods) - [Java Scanner useDelimiter with Examples](https://www.baeldung.com/java-scanner-usedelimiter) +- [Is There a Destructor in Java?](https://www.baeldung.com/java-destructor) From e6d52af6dd5f4985bfb1f7311d79712cd4a24aa0 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:19:32 +0500 Subject: [PATCH 32/86] Updated README.md added link back to the article: https://www.baeldung.com/spring-data-jpa-run-app-without-db --- spring-boot-modules/spring-boot-data-3/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-modules/spring-boot-data-3/README.md b/spring-boot-modules/spring-boot-data-3/README.md index 7d843af9ea..3959894853 100644 --- a/spring-boot-modules/spring-boot-data-3/README.md +++ b/spring-boot-modules/spring-boot-data-3/README.md @@ -1 +1,2 @@ ### Relevant Articles: +- [Spring Data JPA – Run an App Without a Database](https://www.baeldung.com/spring-data-jpa-run-app-without-db) From 115bb62d76f0a35408be56946acaa89081ef7bf0 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:24:38 +0500 Subject: [PATCH 33/86] Updated README.md added link back to the article: https://www.baeldung.com/spring-data-mongodb-composite-key --- persistence-modules/spring-boot-persistence-mongodb-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/README.md b/persistence-modules/spring-boot-persistence-mongodb-2/README.md index ba27436109..45d3d192f1 100644 --- a/persistence-modules/spring-boot-persistence-mongodb-2/README.md +++ b/persistence-modules/spring-boot-persistence-mongodb-2/README.md @@ -2,4 +2,5 @@ - [Logging MongoDB Queries with Spring Boot](https://www.baeldung.com/spring-boot-mongodb-logging) - [Configure MongoDB Collection Name for a Class in Spring Data](https://www.baeldung.com/spring-data-mongodb-collection-name) +- [MongoDB Composite Key With Spring Data](https://www.baeldung.com/spring-data-mongodb-composite-key) - More articles: [[<--prev]](../spring-boot-persistence-mongodb) From b0ee0b040479889bd78a6c60333915ab7b522015 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:28:00 +0500 Subject: [PATCH 34/86] Updated README.md added link back to the article: https://www.baeldung.com/spring-security-exceptionhandler --- spring-security-modules/spring-security-core-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-security-modules/spring-security-core-2/README.md b/spring-security-modules/spring-security-core-2/README.md index 9ce12af8ef..bf70693eb5 100644 --- a/spring-security-modules/spring-security-core-2/README.md +++ b/spring-security-modules/spring-security-core-2/README.md @@ -4,6 +4,7 @@ This module contains articles about core Spring Security ### Relevant Articles: - [Handle Spring Security Exceptions](https://www.baeldung.com/spring-security-exceptions) +- [Handle Spring Security Exceptions With @ExceptionHandler](https://www.baeldung.com/spring-security-exceptionhandler) ### Build the Project From 62fee08dffe629dab160d28c5d1b5239bdc6f6da Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:42:24 +0500 Subject: [PATCH 35/86] Updated README.md added link back to the article: https://www.baeldung.com/java-flux-create-generate --- reactor-core/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/reactor-core/README.md b/reactor-core/README.md index 7ca3b5773f..c0d4a3fc3c 100644 --- a/reactor-core/README.md +++ b/reactor-core/README.md @@ -11,3 +11,4 @@ This module contains articles about Reactor Core. - [Project Reactor: map() vs flatMap()](https://www.baeldung.com/java-reactor-map-flatmap) - [What Does Mono.defer() Do?](https://www.baeldung.com/java-mono-defer) - [Handling Exceptions in Project Reactor](https://www.baeldung.com/reactor-exceptions) +- [Difference Between Flux.create and Flux.generate](https://www.baeldung.com/java-flux-create-generate) From 08a2c27339c1554b180fab75a4df3cb20a8a5467 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Tue, 21 Jun 2022 22:25:12 +0530 Subject: [PATCH 36/86] JAVA-12359 Committing Test Cases for Colon and Slash Characters --- .../StringFilenameValidationUnitTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java index 3e79458a7c..62690a96ef 100644 --- a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/stringfilenamevalidaiton/StringFilenameValidationUnitTest.java @@ -26,6 +26,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; public class StringFilenameValidationUnitTest { private static final String CORRECT_FILENAME_PATTERN = "baeldung.txt"; + private static final String FILENAME_WITH_COLON = "bael:dung.txt"; + private static final String FILENAME_WITH_FORWARD_SLASH = "bael/dung.txt"; + private static final String FILENAME_WITH_BACKWARD_SLASH = "bael\\dung.txt"; @ParameterizedTest @MethodSource("correctAlphanumericFilenamesProvider") @@ -92,6 +95,26 @@ public class StringFilenameValidationUnitTest { assertThat(validateStringFilenameUsingContains(filename)).isFalse(); } + @Test + @EnabledOnOs(OS.WINDOWS) + public void givenFilenameStringWithInvalidColonWindowsCharAndIsWindows_thenNIO2FailsIOSucceed() + throws IOException { + assertThat(validateStringFilenameUsingIO(FILENAME_WITH_COLON)).isTrue(); + assertThatThrownBy(() -> validateStringFilenameUsingNIO2(FILENAME_WITH_COLON)) + .isInstanceOf(InvalidPathException.class).hasMessageContaining("Illegal char"); + } + + @Test + @EnabledOnOs(OS.WINDOWS) + public void givenFilenameStringWithInvalidSlashWindowsCharAndIsWindows_thenIOFailsNIO2Succeed() { + assertThatThrownBy(() -> validateStringFilenameUsingIO(FILENAME_WITH_FORWARD_SLASH)) + .isInstanceOf(IOException.class).hasMessageContaining("The system cannot find the path specified"); + assertThatThrownBy(() -> validateStringFilenameUsingIO(FILENAME_WITH_BACKWARD_SLASH)) + .isInstanceOf(IOException.class).hasMessageContaining("The system cannot find the path specified"); + assertThat(validateStringFilenameUsingNIO2(FILENAME_WITH_FORWARD_SLASH)).isTrue(); + assertThat(validateStringFilenameUsingNIO2(FILENAME_WITH_BACKWARD_SLASH)).isTrue(); + } + @ParameterizedTest @EnabledOnOs({OS.LINUX, OS.MAC}) @MethodSource("filenamesWithInvalidUnixChars") From 2e8e3ba51b64b2021786b58d1825a79dcba68016 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Tue, 21 Jun 2022 19:26:14 +0100 Subject: [PATCH 37/86] [JAVA-12742] Fix Gradle parent modue to work with Gradle 7.x --- gradle/README.md | 1 - gradle/build.gradle | 10 +++++--- gradle/gradle-dependency-management/README.md | 4 +++ .../settings.gradle | 2 +- gradle/gradle-employee-app/build.gradle | 15 ++++++----- gradle/gradle-employee-app/settings.gradle | 1 + .../settings.gradle | 1 + gradle/gradletaskdemo/build.gradle | 25 ++++++++----------- .../gradletaskdemo/build/tmp/jar/MANIFEST.MF | 2 -- gradle/greeter/build.gradle | 8 +++--- gradle/greeting-library-java/build.gradle | 6 ++--- gradle/greeting-library/build.gradle | 4 +-- gradle/settings.gradle | 2 -- 13 files changed, 38 insertions(+), 43 deletions(-) create mode 100644 gradle/gradle-dependency-management/README.md create mode 100644 gradle/gradle-employee-app/settings.gradle create mode 100644 gradle/gradle-source-vs-target-compatibility/settings.gradle delete mode 100644 gradle/gradletaskdemo/build/tmp/jar/MANIFEST.MF diff --git a/gradle/README.md b/gradle/README.md index 149da50f92..1c325cf2fe 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -6,4 +6,3 @@ This module contains articles about Gradle - [Introduction to Gradle](https://www.baeldung.com/gradle) - [Writing Custom Gradle Plugins](https://www.baeldung.com/gradle-create-plugin) - [A Custom Task in Gradle](https://www.baeldung.com/gradle-custom-task) -- [Dependency Management in Gradle](https://www.baeldung.com/gradle-dependency-management) diff --git a/gradle/build.gradle b/gradle/build.gradle index 2e5d984fba..d808f4a3cc 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'org.shipkit.bintray-release' version '2.3.5' +} + allprojects { repositories { - jcenter() + mavenCentral() } } - subprojects { - version = '1.0' } @@ -89,4 +91,4 @@ task printJavaVersionBuildSrc(type : PrintToolVersionBuildSrcTask) { task printGroovyVersionBuildSrc(type : PrintToolVersionBuildSrcTask) { tool 'groovy' -} \ No newline at end of file +} diff --git a/gradle/gradle-dependency-management/README.md b/gradle/gradle-dependency-management/README.md new file mode 100644 index 0000000000..60ac66aa87 --- /dev/null +++ b/gradle/gradle-dependency-management/README.md @@ -0,0 +1,4 @@ +### Relevant Articles: + +- [Dependency Management in Gradle](https://www.baeldung.com/gradle-dependency-management) + diff --git a/gradle/gradle-dependency-management/settings.gradle b/gradle/gradle-dependency-management/settings.gradle index 09bfe08af7..b2be0dced7 100644 --- a/gradle/gradle-dependency-management/settings.gradle +++ b/gradle/gradle-dependency-management/settings.gradle @@ -1 +1 @@ -rootProject.name = 'dependencymanagement' +rootProject.name = 'gradle-dependency-management' diff --git a/gradle/gradle-employee-app/build.gradle b/gradle/gradle-employee-app/build.gradle index b343d2b210..c7040504f1 100644 --- a/gradle/gradle-employee-app/build.gradle +++ b/gradle/gradle-employee-app/build.gradle @@ -6,10 +6,8 @@ plugins { apply plugin: 'application' mainClassName = 'employee.EmployeeApp' -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 println 'This is executed during configuration phase' @@ -17,20 +15,21 @@ task configured { println 'The project is configured' } -task wrapper(type: Wrapper){ +wrapper { gradleVersion = '5.3.1' } repositories { - jcenter() + mavenCentral() } dependencies { - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' testImplementation('junit:junit:4.13') - testRuntime('junit:junit:4.13') + testRuntimeOnly('junit:junit:4.13') } + test { useJUnit() } diff --git a/gradle/gradle-employee-app/settings.gradle b/gradle/gradle-employee-app/settings.gradle new file mode 100644 index 0000000000..c6749f9e68 --- /dev/null +++ b/gradle/gradle-employee-app/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-employee-app' diff --git a/gradle/gradle-source-vs-target-compatibility/settings.gradle b/gradle/gradle-source-vs-target-compatibility/settings.gradle new file mode 100644 index 0000000000..0d985fb082 --- /dev/null +++ b/gradle/gradle-source-vs-target-compatibility/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-source-vs-target-compatibility' diff --git a/gradle/gradletaskdemo/build.gradle b/gradle/gradletaskdemo/build.gradle index 58dadd7460..5f07573365 100644 --- a/gradle/gradletaskdemo/build.gradle +++ b/gradle/gradletaskdemo/build.gradle @@ -5,16 +5,14 @@ buildscript { } } dependencies { - classpath "org.shipkit:shipkit:0.9.117" + classpath "org.shipkit:shipkit:2.3.5" } } - plugins { id 'java' } - apply from: 'aplugin.gradle' apply plugin: 'org.shipkit.bintray-release' @@ -72,8 +70,6 @@ helloBaeldung { } - - //Adding extra task properties task ourTask { ext.theProperty = "theValue" @@ -86,25 +82,24 @@ task printTaskProperty { } - //Declaring dependencies dependencies { - compile group: + implementation group: 'org.springframework', name: 'spring-core', version: '4.3.5.RELEASE' - compile 'org.springframework:spring-core:4.3.5.RELEASE', + implementation 'org.springframework:spring-core:4.3.5.RELEASE', 'org.springframework:spring-aop:4.3.5.RELEASE' - compile( + implementation( [group: 'org.springframework', name: 'spring-core', version: '4.3.5.RELEASE'], [group: 'org.springframework', name: 'spring-aop', version: '4.3.5.RELEASE'] ) - testCompile('org.hibernate:hibernate-core:5.2.12.Final') { + testImplementation('org.hibernate:hibernate-core:5.2.12.Final') { transitive = true } - runtime(group: 'org.hibernate', name: 'hibernate-core', version: '5.2.12.Final') { + runtimeOnly(group: 'org.hibernate', name: 'hibernate-core', version: '5.2.12.Final') { transitive = false } - runtime "org.codehaus.groovy:groovy-all:2.4.11@jar" - runtime group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.11', ext: 'jar' - - compile fileTree(dir: 'libs', include: '*.jar') + runtimeOnly "org.codehaus.groovy:groovy-all:2.4.11@jar" + runtimeOnly group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.11', ext: 'jar' + + implementation fileTree(dir: 'libs', include: '*.jar') } diff --git a/gradle/gradletaskdemo/build/tmp/jar/MANIFEST.MF b/gradle/gradletaskdemo/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 59499bce4a..0000000000 --- a/gradle/gradletaskdemo/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/gradle/greeter/build.gradle b/gradle/greeter/build.gradle index 6f43f23494..0aab8c2313 100644 --- a/gradle/greeter/build.gradle +++ b/gradle/greeter/build.gradle @@ -1,11 +1,11 @@ apply plugin : 'java' apply plugin : 'application' - - dependencies { - compile project(':greeting-library') - compile project(':greeting-library-java') + implementation project(':greeting-library') + implementation project(':greeting-library-java') + + implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.11', ext: 'jar' } mainClassName = 'greeter.Greeter' diff --git a/gradle/greeting-library-java/build.gradle b/gradle/greeting-library-java/build.gradle index 34931bd0cd..916a9a435e 100644 --- a/gradle/greeting-library-java/build.gradle +++ b/gradle/greeting-library-java/build.gradle @@ -1,9 +1,7 @@ apply plugin :'java' //apply plugin : 'application' - - dependencies{ - compile group: 'joda-time', name: 'joda-time', version: '2.9.9' - testCompile group: 'junit', name: 'junit', version: '4.12' + implementation group: 'joda-time', name: 'joda-time', version: '2.9.9' + testImplementation group: 'junit', name: 'junit', version: '4.12' } diff --git a/gradle/greeting-library/build.gradle b/gradle/greeting-library/build.gradle index eb526b3b03..a8fa91963c 100644 --- a/gradle/greeting-library/build.gradle +++ b/gradle/greeting-library/build.gradle @@ -1,9 +1,9 @@ apply plugin : 'groovy' dependencies { - compile 'org.codehaus.groovy:groovy:2.4.12' + implementation 'org.codehaus.groovy:groovy:2.4.12' - testCompile 'org.spockframework:spock-core:1.0-groovy-2.4', { + testImplementation 'org.spockframework:spock-core:1.0-groovy-2.4', { exclude module : 'groovy-all' } } diff --git a/gradle/settings.gradle b/gradle/settings.gradle index aeb462045d..ba255f25c2 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -4,7 +4,5 @@ include 'greeting-library' include 'greeting-library-java' include 'greeter' include 'gradletaskdemo' -include 'gradle-employee-app' -include 'gradle-source-vs-target-compatibility' println 'This will be executed during the initialization phase.' From a746e8119da4e1c731d7c1670202f03290b33964 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 22 Jun 2022 13:45:36 +0300 Subject: [PATCH 38/86] BAEL-5632 add jar example --- .../java/com/baeldung/createjar/Driver.java | 19 +++++ .../com/baeldung/createjar/HelloWorld.java | 7 ++ .../java/com/baeldung/createjar/JarTool.java | 69 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/Driver.java create mode 100644 core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/HelloWorld.java create mode 100644 core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/JarTool.java diff --git a/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/Driver.java b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/Driver.java new file mode 100644 index 0000000000..e0b2eab707 --- /dev/null +++ b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/Driver.java @@ -0,0 +1,19 @@ +package com.baeldung.createjar; + +import java.io.File; +import java.io.IOException; +import java.util.jar.*; +import com.baeldung.createjar.JarTool; + +public class Driver { + + public static void main(String[] args) throws IOException { + JarTool tool = new JarTool(); + tool.startManifest(); + tool.addToManifest("Main-Class", "com.baeldung.createjar.HelloWorld"); + JarOutputStream target = tool.openJar("HelloWorld.jar"); + + tool.addFile(target, System.getProperty("user.dir") + "\\src\\main\\java", System.getProperty("user.dir") + "\\src\\main\\java\\com\\baeldung\\createjar\\HelloWorld.class"); + target.close(); + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/HelloWorld.java b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/HelloWorld.java new file mode 100644 index 0000000000..79a6758fce --- /dev/null +++ b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/HelloWorld.java @@ -0,0 +1,7 @@ +package com.baeldung.createjar; + +public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World!"); + } +} diff --git a/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/JarTool.java b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/JarTool.java new file mode 100644 index 0000000000..3709aa3300 --- /dev/null +++ b/core-java-modules/core-java-jar/src/main/java/com/baeldung/createjar/JarTool.java @@ -0,0 +1,69 @@ +package com.baeldung.createjar; + +import java.io.*; +import java.util.jar.*; + +public class JarTool { + private Manifest manifest = new Manifest(); + + public void addToManifest(String key, String value) { + manifest.getMainAttributes() + .put(new Attributes.Name(key), value); + } + + public void addDirectoryEntry(JarOutputStream target, String parentPath, File dir) throws IOException { + String remaining = ""; + if (parentPath.endsWith(File.separator)) + remaining = dir.getAbsolutePath() + .substring(parentPath.length()); + else + remaining = dir.getAbsolutePath() + .substring(parentPath.length() + 1); + String name = remaining.replace("\\", "/"); + if (!name.endsWith("/")) + name += "/"; + JarEntry entry = new JarEntry(name); + entry.setTime(dir.lastModified()); + target.putNextEntry(entry); + target.closeEntry(); + } + + public void addFile(JarOutputStream target, String rootPath, String source) throws IOException { + BufferedInputStream in = null; + String remaining = ""; + if (rootPath.endsWith(File.separator)) + remaining = source.substring(rootPath.length()); + else + remaining = source.substring(rootPath.length() + 1); + String name = remaining.replace("\\", "/"); + JarEntry entry = new JarEntry(name); + entry.setTime(new File(source).lastModified()); + target.putNextEntry(entry); + in = new BufferedInputStream(new FileInputStream(source)); + byte[] buffer = new byte[1024]; + while (true) { + int count = in.read(buffer); + if (count == -1) + break; + target.write(buffer, 0, count); + } + target.closeEntry(); + in.close(); + } + + public JarOutputStream openJar(String jarFile) throws IOException { + JarOutputStream target = new JarOutputStream(new FileOutputStream(jarFile), manifest); + return target; + } + + public void setMainClass(String mainFQCN) { + if (mainFQCN != null && !mainFQCN.equals("")) + manifest.getMainAttributes() + .put(Attributes.Name.MAIN_CLASS, mainFQCN); + } + + public void startManifest() { + manifest.getMainAttributes() + .put(Attributes.Name.MANIFEST_VERSION, "1.0"); + } +} \ No newline at end of file From 93eb5669cf459ee522ca97191dc710567ac50679 Mon Sep 17 00:00:00 2001 From: freelansam <79205526+freelansam@users.noreply.github.com> Date: Wed, 22 Jun 2022 20:58:56 +0530 Subject: [PATCH 39/86] Java 4493 (#12393) * JAVA-4493: Add missing live test for Consumer Driven Contracts article * JAVA-4493: Add missing live test for Consumer Driven Contracts article * JAVA-4493: code sync up with article --- libraries-5/pom.xml | 13 +++++++++++++ .../com/baeldung/pact/PactProviderLiveTest.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml index 85b1f3b475..eefc265457 100644 --- a/libraries-5/pom.xml +++ b/libraries-5/pom.xml @@ -118,6 +118,19 @@ ${jmh-core.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + target/mypacts + + + + 3.6.3 diff --git a/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java b/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java index 7b72dec852..b53e88c61a 100644 --- a/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java +++ b/libraries-5/src/test/java/com/baeldung/pact/PactProviderLiveTest.java @@ -17,7 +17,7 @@ import au.com.dius.pact.provider.junit5.PactVerificationContext; import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; @Provider("test_provider") -@PactFolder("target/pacts") +@PactFolder("target/mypacts") public class PactProviderLiveTest { private static ConfigurableWebApplicationContext application; From c36cbb21e3a4f439c3c9cd63c7daa8284dc42ec9 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 22 Jun 2022 21:51:51 +0300 Subject: [PATCH 40/86] fix readme links for docker articles --- docker-modules/README.md | 9 --------- docker-modules/docker-caching/README.md | 3 +++ docker-modules/docker-compose/README.md | 4 ++++ docker-modules/{ => docker-compose}/docker-compose.yml | 0 .../docker-include-outside-build-context/README.md | 3 +++ docker-modules/docker-sample-app/README.md | 3 +++ docker-modules/docker-spring-boot/README.md | 1 + docker-modules/dockerfile-with-git/README.md | 3 +++ 8 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 docker-modules/README.md create mode 100644 docker-modules/docker-caching/README.md create mode 100644 docker-modules/docker-compose/README.md rename docker-modules/{ => docker-compose}/docker-compose.yml (100%) create mode 100644 docker-modules/docker-include-outside-build-context/README.md create mode 100644 docker-modules/docker-sample-app/README.md create mode 100644 docker-modules/dockerfile-with-git/README.md diff --git a/docker-modules/README.md b/docker-modules/README.md deleted file mode 100644 index f5daa19b08..0000000000 --- a/docker-modules/README.md +++ /dev/null @@ -1,9 +0,0 @@ -## Relevant Articles: - -- [Introduction to Docker Compose](https://www.baeldung.com/ops/docker-compose) -- [Reusing Docker Layers with Spring Boot](https://www.baeldung.com/docker-layers-spring-boot) -- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) -- [Dockerfile Strategies for Git](https://www.baeldung.com/ops/dockerfile-git-strategies) -- [How to Get Docker-Compose to Always Use the Latest Image](https://www.baeldung.com/ops/docker-compose-latest-image) -- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context) -- [Caching Maven Dependencies with Docker](https://www.baeldung.com/ops/docker-cache-maven-dependencies) diff --git a/docker-modules/docker-caching/README.md b/docker-modules/docker-caching/README.md new file mode 100644 index 0000000000..d985210683 --- /dev/null +++ b/docker-modules/docker-caching/README.md @@ -0,0 +1,3 @@ +## Relevant Articles: + +- [Caching Maven Dependencies with Docker](https://www.baeldung.com/ops/docker-cache-maven-dependencies) diff --git a/docker-modules/docker-compose/README.md b/docker-modules/docker-compose/README.md new file mode 100644 index 0000000000..243e81fc80 --- /dev/null +++ b/docker-modules/docker-compose/README.md @@ -0,0 +1,4 @@ +## Relevant Articles: + +- [Introduction to Docker Compose](https://www.baeldung.com/ops/docker-compose) + diff --git a/docker-modules/docker-compose.yml b/docker-modules/docker-compose/docker-compose.yml similarity index 100% rename from docker-modules/docker-compose.yml rename to docker-modules/docker-compose/docker-compose.yml diff --git a/docker-modules/docker-include-outside-build-context/README.md b/docker-modules/docker-include-outside-build-context/README.md new file mode 100644 index 0000000000..55cc564163 --- /dev/null +++ b/docker-modules/docker-include-outside-build-context/README.md @@ -0,0 +1,3 @@ +## Relevant Articles: + +- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context) \ No newline at end of file diff --git a/docker-modules/docker-sample-app/README.md b/docker-modules/docker-sample-app/README.md new file mode 100644 index 0000000000..d35abbc7e5 --- /dev/null +++ b/docker-modules/docker-sample-app/README.md @@ -0,0 +1,3 @@ +## Relevant Articles: + +- [How to Get Docker-Compose to Always Use the Latest Image](https://www.baeldung.com/ops/docker-compose-latest-image) \ No newline at end of file diff --git a/docker-modules/docker-spring-boot/README.md b/docker-modules/docker-spring-boot/README.md index 0fc9d2b6b5..7b16790783 100644 --- a/docker-modules/docker-spring-boot/README.md +++ b/docker-modules/docker-spring-boot/README.md @@ -2,3 +2,4 @@ - [Creating Docker Images with Spring Boot](https://www.baeldung.com/spring-boot-docker-images) - [Starting Spring Boot Application in Docker With Profile](https://www.baeldung.com/spring-boot-docker-start-with-profile) +- [Reusing Docker Layers with Spring Boot](https://www.baeldung.com/docker-layers-spring-boot) diff --git a/docker-modules/dockerfile-with-git/README.md b/docker-modules/dockerfile-with-git/README.md new file mode 100644 index 0000000000..7e27328678 --- /dev/null +++ b/docker-modules/dockerfile-with-git/README.md @@ -0,0 +1,3 @@ +## Relevant Articles: + +- [Dockerfile Strategies for Git](https://www.baeldung.com/ops/dockerfile-git-strategies) From d58fe693b99afda2d847fc435fd9d3ac0ec43dec Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Thu, 23 Jun 2022 10:35:35 +0300 Subject: [PATCH 41/86] Update application.properties --- .../src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties index 7188b74c9b..a0d9d89934 100644 --- a/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties +++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties @@ -1,7 +1,7 @@ server.port=8085 spring.main.allow-bean-definition-overriding=true spring.application.name= openfeign -logging.level.com.baeldung.cloud.openfeign.client: DEBUG +logging.level.com.baeldung.cloud.openfeign.client=DEBUG feign.hystrix.enabled=true spring.security.oauth2.client.registration.keycloak.authorization-grant-type=client_credentials From 17b5c33d5114df219a3407e184e6fa35193ee6b3 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Thu, 23 Jun 2022 09:53:16 +0100 Subject: [PATCH 42/86] [JAVA-12746] Fix gradle-to-maven module to work with Gradle 7.x --- gradle/gradle-to-maven/build.gradle | 78 +++++++++++++++++++------- gradle/gradle-to-maven/settings.gradle | 1 + 2 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 gradle/gradle-to-maven/settings.gradle diff --git a/gradle/gradle-to-maven/build.gradle b/gradle/gradle-to-maven/build.gradle index 110edbc421..7cd2617ef4 100644 --- a/gradle/gradle-to-maven/build.gradle +++ b/gradle/gradle-to-maven/build.gradle @@ -3,39 +3,79 @@ repositories { } apply plugin: 'java' -apply plugin: 'maven' +apply plugin: 'maven-publish' group = 'com.baeldung' // by default, pom's artifactId is taken from the directory name -version = '0.0.1-SNAPSHOT' +version = '0.0.1' dependencies { - compile('org.slf4j:slf4j-api') - testCompile('junit:junit') + implementation 'org.slf4j:slf4j-api:1.7.25' + testImplementation 'junit:junit:4.12' } -install { - repositories { - mavenInstaller { - pom.version = '0.0.1-maven-SNAPSHOT' - pom.groupId = 'com.baeldung.sample' - pom.artifactId = 'gradle-maven-converter' - pom.project { - inceptionYear '2020' +// basic publishing + +//publishing { +// publications { +// customLibrary(MavenPublication) { +// from components.java +// } +// } +// +// repositories { +// maven { +// name = 'sampleRepo' +// url = layout.buildDirectory.dir("repo") +// } +// } +//} + +// customized publishing + +publishing { + publications { + customLibrary(MavenPublication) { + groupId = 'com.baeldung.sample' + artifactId = 'gradle-maven-converter' + version = '0.0.1-maven' + + from components.java + + pom { + name = 'Sample Library' + description = 'A description of sample library' + url = 'http://www.example.com/library' licenses { license { - name 'My License' - url 'http://www.mycompany.com/licenses/license.txt' - distribution 'repo' + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' } } } - pom.whenConfigured {pom -> - pom.dependencies.find {dep -> dep.groupId == 'junit' && dep.artifactId == 'junit' }.optional = true + + pom.withXml { + asNode() + .dependencies + .dependency + .findAll { dependency -> + // find all dependencies with runtime scope + dependency.scope.text() == 'runtime' + } + .each { dependency -> + // set the scope to 'compile' + dependency.scope*.value = 'compile' + } } - pom.writeTo("${mavenPomDir}/${project.group}/${project.name}/pom.xml") } } -} \ No newline at end of file + + repositories { + maven { + name = 'sampleRepo' + url = layout.buildDirectory.dir("repo") + } + } +} diff --git a/gradle/gradle-to-maven/settings.gradle b/gradle/gradle-to-maven/settings.gradle new file mode 100644 index 0000000000..f0c21fcf4e --- /dev/null +++ b/gradle/gradle-to-maven/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-to-maven' From cf932245aa5cf60e9d8a255e5c662de7090232d3 Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Thu, 23 Jun 2022 21:06:31 +0530 Subject: [PATCH 43/86] JAVA-12710 Look into XML Serialization and Deserialization with Jackson article --- .../xml/XMLSerializeDeserializeUnitTest.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java index 74ba28d996..6d0a5df627 100644 --- a/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java +++ b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java @@ -48,8 +48,7 @@ public class XMLSerializeDeserializeUnitTest { public void whenJavaGotFromXmlFile_thenCorrect() throws IOException { File file = new File("src/test/resources/simple_bean.xml"); XmlMapper xmlMapper = new XmlMapper(); - String xml = inputStreamToString(new FileInputStream(file)); - SimpleBean value = xmlMapper.readValue(xml, SimpleBean.class); + SimpleBean value = xmlMapper.readValue(file, SimpleBean.class); assertTrue(value.getX() == 1 && value.getY() == 2); } @@ -122,19 +121,6 @@ public class XMLSerializeDeserializeUnitTest { xmlMapper.writeValue(byteArrayOutputStream, person); assertEquals(expectedXml, byteArrayOutputStream.toString()); } - - private static String inputStreamToString(InputStream is) throws IOException { - BufferedReader br; - StringBuilder sb = new StringBuilder(); - - String line; - br = new BufferedReader(new InputStreamReader(is)); - while ((line = br.readLine()) != null) { - sb.append(line); - } - br.close(); - return sb.toString(); - } } class SimpleBean { From 20dc126a647eda5bbc8d94899c669f22c46fc957 Mon Sep 17 00:00:00 2001 From: tudormarc <93496164+tudormarc@users.noreply.github.com> Date: Fri, 24 Jun 2022 06:57:48 +0300 Subject: [PATCH 44/86] BAEL-5560 - checking even and odd numbers (#12388) --- core-java-modules/java-numbers-5/README.md | 1 + core-java-modules/java-numbers-5/pom.xml | 25 +++++++ .../java/com/baeldung/evenodd/EvenOdd.java | 46 +++++++++++++ .../com/baeldung/evenodd/EvenOddUnitTest.java | 68 +++++++++++++++++++ core-java-modules/pom.xml | 1 + 5 files changed, 141 insertions(+) create mode 100644 core-java-modules/java-numbers-5/README.md create mode 100644 core-java-modules/java-numbers-5/pom.xml create mode 100644 core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java create mode 100644 core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java diff --git a/core-java-modules/java-numbers-5/README.md b/core-java-modules/java-numbers-5/README.md new file mode 100644 index 0000000000..7d843af9ea --- /dev/null +++ b/core-java-modules/java-numbers-5/README.md @@ -0,0 +1 @@ +### Relevant Articles: diff --git a/core-java-modules/java-numbers-5/pom.xml b/core-java-modules/java-numbers-5/pom.xml new file mode 100644 index 0000000000..f5805981ae --- /dev/null +++ b/core-java-modules/java-numbers-5/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + java-numbers-5 + java-numbers-5 + jar + + + com.baeldung.core-java-modules + core-java-modules + 0.0.1-SNAPSHOT + + + + java-numbers-5 + + + src/main/resources + true + + + + + \ No newline at end of file diff --git a/core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java b/core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java new file mode 100644 index 0000000000..5323dcbe11 --- /dev/null +++ b/core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java @@ -0,0 +1,46 @@ +package com.baeldung.evenodd; + +public class EvenOdd { + + static boolean isEven(int x) { + return x % 2 == 0; + } + + static boolean isOdd(int x) { + return x % 2 == 1; + } + + static boolean isOrEven(int x) { + return (x | 1) > x; + } + + static boolean isOrOdd(int x) { + return (x | 1) == x; + } + + static boolean isAndEven(int x) { + return (x & 1) == 0; + } + + static boolean isAndOdd(int x) { + return (x & 1) == 1; + } + + static boolean isXorEven(int x) { + return (x ^ 1) > x; + } + + static boolean isXorOdd(int x) { + return (x ^ 1) < x; + } + + static boolean isLsbEven(int x) { + return Integer.toBinaryString(x) + .endsWith("0"); + } + + static boolean isLsbOdd(int x) { + return Integer.toBinaryString(x) + .endsWith("1"); + } +} diff --git a/core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java b/core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java new file mode 100644 index 0000000000..82810977ba --- /dev/null +++ b/core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java @@ -0,0 +1,68 @@ +package com.baeldung.evenodd; + +import static com.baeldung.evenodd.EvenOdd.isAndEven; +import static com.baeldung.evenodd.EvenOdd.isAndOdd; +import static com.baeldung.evenodd.EvenOdd.isEven; +import static com.baeldung.evenodd.EvenOdd.isLsbEven; +import static com.baeldung.evenodd.EvenOdd.isLsbOdd; +import static com.baeldung.evenodd.EvenOdd.isOdd; +import static com.baeldung.evenodd.EvenOdd.isOrEven; +import static com.baeldung.evenodd.EvenOdd.isOrOdd; +import static com.baeldung.evenodd.EvenOdd.isXorEven; +import static com.baeldung.evenodd.EvenOdd.isXorOdd; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class EvenOddUnitTest { + + @Test + public void whenNumberIsEven_thenReturnTrue() { + assertEquals(true, isEven(2)); + } + + @Test + public void whenNumberIsOdd_thenReturnTrue() { + assertEquals(true, isOdd(3)); + } + + @Test + public void whenNumberIsEven_thenReturnTrueWithOr() { + assertEquals(true, isOrEven(4)); + } + + @Test + public void whenNumberIsOdd_thenReturnTrueOr() { + assertEquals(true, isOrOdd(5)); + } + + @Test + public void whenNumberIsEven_thenReturnTrueAnd() { + assertEquals(true, isAndEven(6)); + } + + @Test + public void whenNumberIsOdd_thenReturnTrueAnd() { + assertEquals(true, isAndOdd(7)); + } + + @Test + public void whenNumberIsEven_thenReturnTrueXor() { + assertEquals(true, isXorEven(8)); + } + + @Test + public void whenNumberIsOdd_thenReturnTrueXor() { + assertEquals(true, isXorOdd(9)); + } + + @Test + public void whenNumberIsEven_thenReturnTrueLsb() { + assertEquals(true, isLsbEven(10)); + } + + @Test + public void whenNumberIsOdd_thenReturnTrueLsb() { + assertEquals(true, isLsbOdd(11)); + } +} diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 8d30c545e2..c2576d84f1 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -127,6 +127,7 @@ java-numbers-2 java-numbers-3 java-numbers-4 + java-numbers-5 From 3f4688d2b36543a7cd53e46de3d4aaac52e75839 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Fri, 24 Jun 2022 15:35:58 +0500 Subject: [PATCH 45/86] Updated README.md removed the article Hide a Request Field in Swagger API. It's already been moved to https://github.com/eugenp/tutorials/tree/master/spring-boot-modules/spring-boot-mvc-4. --- spring-boot-modules/spring-boot-mvc/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-boot-modules/spring-boot-mvc/README.md b/spring-boot-modules/spring-boot-mvc/README.md index fdd7c70af2..852990bd73 100644 --- a/spring-boot-modules/spring-boot-mvc/README.md +++ b/spring-boot-modules/spring-boot-mvc/README.md @@ -11,5 +11,4 @@ This module contains articles about Spring Web MVC in Spring Boot projects. - [Using Spring ResponseEntity to Manipulate the HTTP Response](https://www.baeldung.com/spring-response-entity) - [The @ServletComponentScan Annotation in Spring Boot](https://www.baeldung.com/spring-servletcomponentscan) - [Guide to Internationalization in Spring Boot](https://www.baeldung.com/spring-boot-internationalization) -- [Hide a Request Field in Swagger API](https://www.baeldung.com/spring-swagger-hide-field) - More articles: [[next -->]](/spring-boot-modules/spring-boot-mvc-2) From a51caf51f33709e126830db66a459c45883bd20f Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Fri, 24 Jun 2022 17:28:34 +0100 Subject: [PATCH 46/86] Java 11497 (#12399) * Added/created parent module (json-modules) * moved json(submodule) to json-modules(parent) * moved json-2(submodule) to json-modules(parent) * moved json-path(submodule) to json-modules(parent) * moved gson(submodule) to json-modules(parent) * deleted sub-modules that we moved to json-modules Co-authored-by: panagiotiskakos --- json-modules/README.md | 3 + {gson => json-modules/gson}/.gitignore | 0 {gson => json-modules/gson}/README.md | 0 {gson => json-modules/gson}/pom.xml | 12 +- .../com/baeldung/gson/entities/ActorGson.java | 0 .../com/baeldung/gson/entities/Animal.java | 0 .../java/com/baeldung/gson/entities/Cow.java | 0 .../java/com/baeldung/gson/entities/Dog.java | 0 .../com/baeldung/gson/entities/Employee.java | 0 .../com/baeldung/gson/entities/Movie.java | 0 .../gson/entities/MovieWithNullValue.java | 0 .../com/baeldung/gson/entities/MyClass.java | 0 .../java/com/baeldung/gson/entities/User.java | 0 .../com/baeldung/gson/entities/Weather.java | 0 .../primitives/models/BooleanExample.java | 0 .../gson/primitives/models/ByteExample.java | 0 .../gson/primitives/models/CharExample.java | 0 .../gson/primitives/models/DoubleExample.java | 0 .../gson/primitives/models/FloatExample.java | 0 .../models/InfinityValuesExample.java | 0 .../gson/primitives/models/LongExample.java | 0 .../primitives/models/PrimitiveBundle.java | 0 .../models/PrimitiveBundleInitialized.java | 0 .../serialization/ActorGsonDeserializer.java | 0 .../serialization/ActorGsonSerializer.java | 0 .../serialization/AnimalDeserializer.java | 0 .../gson/serialization/MapDeserializer.java | 0 .../StringDateMapDeserializer.java | 0 .../serializationwithexclusions/Exclude.java | 0 .../serializationwithexclusions/MyClass.java | 0 .../MyClassWithAnnotatedFields.java | 0 .../MyClassWithCustomAnnotatedFields.java | 0 .../MyClassWithTransientFields.java | 0 .../MySubClass.java | 0 .../MySubClassWithAnnotatedFields.java | 0 .../MySubClassWithCustomAnnotatedFields.java | 0 .../MySubClassWithTransientFields.java | 0 .../gson}/src/main/resources/logback.xml | 0 .../gson/advance/GsonAdvanceUnitTest.java | 0 .../advance/RuntimeTypeAdapterFactory.java | 0 .../JsonObjectConversionsUnitTest.java | 0 .../baeldung/gson/deserialization/Foo.java | 0 .../gson/deserialization/FooDeserializer.java | 0 ...serializerFromJsonWithDifferentFields.java | 0 .../deserialization/FooInstanceCreator.java | 0 .../gson/deserialization/FooWithInner.java | 0 .../gson/deserialization/GenericFoo.java | 0 .../GsonAlternateUnitTest.java | 0 .../GsonDeserializeUnitTest.java | 0 .../MapDeserializationUnitTest.java | 0 .../test/GsonDeserializationUnitTest.java | 0 .../gson/jsoncompare/JsonCompareUnitTest.java | 0 .../primitives/PrimitiveValuesUnitTest.java | 0 .../DifferentNameSerializer.java | 0 .../serialization/GsonSerializeUnitTest.java | 0 ...ngFieldsNotMatchingCriteriaSerializer.java | 0 .../IgnoringFieldsSerializer.java | 0 .../gson/serialization/SourceClass.java | 0 .../test/GsonSerializationUnitTest.java | 4 +- .../serialization/test/JsonFileUnitTest.java | 0 .../SerializationWithExclusionsUnitTest.java | 0 .../gson}/src/test/resources/.gitignore | 0 .../gson}/src/test/resources/logback-test.xml | 0 {json-2 => json-modules/json-2}/README.md | 0 {json-2 => json-modules/json-2}/pom.xml | 2 +- .../com/baeldung/jsoniter/model/Name.java | 0 .../com/baeldung/jsoniter/model/Student.java | 0 .../baeldung/jsonoptimization/Customer.java | 0 .../CustomerDeserializer.java | 0 .../jsonoptimization/CustomerSerializer.java | 0 .../jsonoptimization/CustomerShortNames.java | 0 .../jsonoptimization/CustomerSlim.java | 0 .../CustomerSlimDeserializer.java | 0 .../CustomerSlimSerializer.java | 0 .../CustomerSlimShortNames.java | 0 .../JsonToJavaClassConversion.java | 0 .../jsontojavaclass/pojo/SamplePojo.java | 0 .../jsonvalidation/GsonValidator.java | 0 .../jsonvalidation/JacksonValidator.java | 0 .../jsonvalidation/JsonValidator.java | 0 .../jsontojavaclass/pojo/Address.java | 0 .../baeldung/jsontojavaclass/pojo/Input.java | 0 .../json-2}/src/main/resources/input.json | 0 .../baeldung/fastjson/FastJsonUnitTest.java | 0 .../java/com/baeldung/fastjson/Person.java | 0 .../jsoniter/JsoniterIntroUnitTest.java | 0 .../JacksonDeserializationUnitTest.java | 0 .../jsonldjava/jackson/Person.java | 0 .../HydraJsonldSerializationUnitTest.java | 0 .../serialization/hydrajsonld/Person.java | 0 .../JacksonJsonLdSerializationUnitTest.java | 0 .../serialization/jacksonjsonld/Person.java | 0 .../JsonOptimizationUnitTest.java | 0 .../JsonToJavaClassConversionUnitTest.java | 0 .../jsonvalidation/GsonValidatorUnitTest.java | 0 .../JacksonValidatorUnitTest.java | 0 .../jsonvalidation/JsonValidatorUnitTest.java | 0 .../moshi/AlternativeAdapterUnitTest.java | 0 .../com/baeldung/moshi/ArrayUnitTest.java | 0 .../moshi/ComplexAdapterUnitTest.java | 0 .../com/baeldung/moshi/DefaultUnitTest.java | 0 .../com/baeldung/moshi/PrimitiveUnitTest.java | 0 .../com/baeldung/moshi/RenameUnitTest.java | 0 .../baeldung/moshi/SimpleAdapterUnitTest.java | 0 .../com/baeldung/moshi/TransientUnitTest.java | 0 .../json-2}/src/test/resources/Student.json | 0 .../jsontojavaclass/pojo/SamplePojo.java | 0 .../json_optimization_mock_data.json | 0 .../src/test/resources/sample_input.json | 0 .../json-path}/.gitignore | 0 .../json-path}/README.md | 0 {json-path => json-modules/json-path}/pom.xml | 2 +- .../src/main/resources/intro_api.json | 0 .../src/main/resources/intro_service.json | 0 .../src/main/resources/intro_user.json | 0 .../json-path}/src/main/resources/logback.xml | 0 .../src/main/resources/online_store.json | 44 ++--- .../introduction/JsonPathUnitTest.java | 92 +++++----- .../OperationIntegrationTest.java | 0 .../introduction/ServiceIntegrationTest.java | 0 .../json-path}/src/test/resources/logback.xml | 0 {json => json-modules/json}/README.md | 0 {json => json-modules/json}/pom.xml | 166 +++++++++--------- .../com/baeldung/adapter/PersonAdapter.java | 0 .../java/com/baeldung/escape/JsonEscape.java | 0 .../main/java/com/baeldung/jsonb/Person.java | 0 .../java/com/baeldung/jsonjava/CDLDemo.java | 0 .../com/baeldung/jsonjava/CookieDemo.java | 0 .../java/com/baeldung/jsonjava/DemoBean.java | 0 .../java/com/baeldung/jsonjava/HTTPDemo.java | 0 .../com/baeldung/jsonjava/JSONArrayDemo.java | 0 .../jsonjava/JSONArrayGetValueByKey.java | 0 .../com/baeldung/jsonjava/JSONObjectDemo.java | 0 .../baeldung/jsonjava/JSONTokenerDemo.java | 0 .../baeldung/jsonjava/ObjectToFromJSON.java | 0 .../iterate/JSONObjectIterator.java | 100 +++++------ .../baeldung/jsonpointer/JsonPointerCrud.java | 0 .../json}/src/main/resources/logback.xml | 0 .../json}/src/main/webapp/index.html | 0 .../json}/src/main/webapp/js/app.js | 0 .../json}/src/main/webapp/js/schema.js | 0 .../json}/src/main/webapp/js/ui-schema.js | 0 .../json}/src/main/webapp/package.json | 20 +-- .../baeldung/escape/JsonEscapeUnitTest.java | 0 .../json/schema/JSONSchemaUnitTest.java | 0 .../com/baeldung/jsonb/JsonbUnitTest.java | 0 .../baeldung/jsonjava/CDLIntegrationTest.java | 0 .../jsonjava/CookieIntegrationTest.java | 0 .../jsonjava/HTTPIntegrationTest.java | 0 .../JSONArrayGetValueByKeyUnitTest.java | 0 .../jsonjava/JSONArrayIntegrationTest.java | 0 .../jsonjava/JSONObjectIntegrationTest.java | 0 .../jsonjava/JSONTokenerIntegrationTest.java | 0 .../ObjectToFromJSONIntegrationTest.java | 0 .../iterate/JSONObjectIteratorUnitTest.java | 158 ++++++++--------- .../jsonpointer/JsonPointerCrudUnitTest.java | 0 .../json}/src/test/resources/address.json | 0 .../json}/src/test/resources/books.json | 0 .../src/test/resources/product_invalid.json | 10 +- .../src/test/resources/product_valid.json | 10 +- .../json}/src/test/resources/schema.json | 44 ++--- json-modules/pom.xml | 36 ++++ pom.xml | 10 +- 163 files changed, 377 insertions(+), 336 deletions(-) create mode 100644 json-modules/README.md rename {gson => json-modules/gson}/.gitignore (100%) rename {gson => json-modules/gson}/README.md (100%) rename {gson => json-modules/gson}/pom.xml (86%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/ActorGson.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Animal.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Cow.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Dog.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Employee.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Movie.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/MovieWithNullValue.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/MyClass.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/User.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/entities/Weather.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/BooleanExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/ByteExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/CharExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/DoubleExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/FloatExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/InfinityValuesExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/LongExample.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundle.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serialization/ActorGsonDeserializer.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serialization/ActorGsonSerializer.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serialization/AnimalDeserializer.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serialization/MapDeserializer.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serialization/StringDateMapDeserializer.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/Exclude.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClass.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithAnnotatedFields.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithCustomAnnotatedFields.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithTransientFields.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClass.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithAnnotatedFields.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithCustomAnnotatedFields.java (100%) rename {gson => json-modules/gson}/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithTransientFields.java (100%) rename {gson => json-modules/gson}/src/main/resources/logback.xml (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/advance/GsonAdvanceUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/advance/RuntimeTypeAdapterFactory.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/conversion/JsonObjectConversionsUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/Foo.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/FooDeserializer.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/FooDeserializerFromJsonWithDifferentFields.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/FooInstanceCreator.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/FooWithInner.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/GenericFoo.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/GsonAlternateUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/GsonDeserializeUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/MapDeserializationUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/jsoncompare/JsonCompareUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/primitives/PrimitiveValuesUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/DifferentNameSerializer.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsNotMatchingCriteriaSerializer.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsSerializer.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/SourceClass.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java (98%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serialization/test/JsonFileUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/java/com/baeldung/gson/serializationwithexclusions/SerializationWithExclusionsUnitTest.java (100%) rename {gson => json-modules/gson}/src/test/resources/.gitignore (100%) rename {gson => json-modules/gson}/src/test/resources/logback-test.xml (100%) rename {json-2 => json-modules/json-2}/README.md (100%) rename {json-2 => json-modules/json-2}/pom.xml (99%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsoniter/model/Name.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsoniter/model/Student.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/Customer.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerDeserializer.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerSerializer.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerShortNames.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerSlim.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerSlimDeserializer.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerSlimSerializer.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonoptimization/CustomerSlimShortNames.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversion.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsontojavaclass/pojo/SamplePojo.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonvalidation/GsonValidator.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonvalidation/JacksonValidator.java (100%) rename {json-2 => json-modules/json-2}/src/main/java/com/baeldung/jsonvalidation/JsonValidator.java (100%) rename {json-2 => json-modules/json-2}/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Address.java (100%) rename {json-2 => json-modules/json-2}/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Input.java (100%) rename {json-2 => json-modules/json-2}/src/main/resources/input.json (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/fastjson/FastJsonUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/fastjson/Person.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsoniter/JsoniterIntroUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonoptimization/JsonOptimizationUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversionUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonvalidation/GsonValidatorUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonvalidation/JacksonValidatorUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/jsonvalidation/JsonValidatorUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/ArrayUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/DefaultUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/RenameUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/java/com/baeldung/moshi/TransientUnitTest.java (100%) rename {json-2 => json-modules/json-2}/src/test/resources/Student.json (100%) rename {json-2 => json-modules/json-2}/src/test/resources/com/baeldung/jsontojavaclass/pojo/SamplePojo.java (100%) rename {json-2 => json-modules/json-2}/src/test/resources/json_optimization_mock_data.json (100%) rename {json-2 => json-modules/json-2}/src/test/resources/sample_input.json (100%) rename {json-path => json-modules/json-path}/.gitignore (100%) rename {json-path => json-modules/json-path}/README.md (100%) rename {json-path => json-modules/json-path}/pom.xml (93%) rename {json-path => json-modules/json-path}/src/main/resources/intro_api.json (100%) rename {json-path => json-modules/json-path}/src/main/resources/intro_service.json (100%) rename {json-path => json-modules/json-path}/src/main/resources/intro_user.json (100%) rename {json-path => json-modules/json-path}/src/main/resources/logback.xml (100%) rename {json-path => json-modules/json-path}/src/main/resources/online_store.json (95%) rename {json-path => json-modules/json-path}/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java (96%) rename {json-path => json-modules/json-path}/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java (100%) rename {json-path => json-modules/json-path}/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java (100%) rename {json-path => json-modules/json-path}/src/test/resources/logback.xml (100%) rename {json => json-modules/json}/README.md (100%) rename {json => json-modules/json}/pom.xml (95%) rename {json => json-modules/json}/src/main/java/com/baeldung/adapter/PersonAdapter.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/escape/JsonEscape.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonb/Person.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/CDLDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/CookieDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/DemoBean.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/HTTPDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/JSONArrayGetValueByKey.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/JSONTokenerDemo.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java (100%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java (96%) rename {json => json-modules/json}/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java (100%) rename {json => json-modules/json}/src/main/resources/logback.xml (100%) rename {json => json-modules/json}/src/main/webapp/index.html (100%) rename {json => json-modules/json}/src/main/webapp/js/app.js (100%) rename {json => json-modules/json}/src/main/webapp/js/schema.js (100%) rename {json => json-modules/json}/src/main/webapp/js/ui-schema.js (100%) rename {json => json-modules/json}/src/main/webapp/package.json (95%) rename {json => json-modules/json}/src/test/java/com/baeldung/escape/JsonEscapeUnitTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonb/JsonbUnitTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/CDLIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/CookieIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/HTTPIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/JSONArrayGetValueByKeyUnitTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/JSONArrayIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/JSONTokenerIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java (100%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java (97%) rename {json => json-modules/json}/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java (100%) rename {json => json-modules/json}/src/test/resources/address.json (100%) rename {json => json-modules/json}/src/test/resources/books.json (100%) rename {json => json-modules/json}/src/test/resources/product_invalid.json (91%) rename {json => json-modules/json}/src/test/resources/product_valid.json (92%) rename {json => json-modules/json}/src/test/resources/schema.json (96%) create mode 100644 json-modules/pom.xml diff --git a/json-modules/README.md b/json-modules/README.md new file mode 100644 index 0000000000..a7100c40c8 --- /dev/null +++ b/json-modules/README.md @@ -0,0 +1,3 @@ +## JSON + +This module contains modules about JSON. diff --git a/gson/.gitignore b/json-modules/gson/.gitignore similarity index 100% rename from gson/.gitignore rename to json-modules/gson/.gitignore diff --git a/gson/README.md b/json-modules/gson/README.md similarity index 100% rename from gson/README.md rename to json-modules/gson/README.md diff --git a/gson/pom.xml b/json-modules/gson/pom.xml similarity index 86% rename from gson/pom.xml rename to json-modules/gson/pom.xml index 082e53baf0..bd0b562785 100644 --- a/gson/pom.xml +++ b/json-modules/gson/pom.xml @@ -9,9 +9,8 @@ com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java + json-modules + 1.0.0-SNAPSHOT @@ -42,12 +41,18 @@ commons-lang3 ${commons-lang3.version} + + com.google.guava + guava + ${guava.version} + com.google.code.gson gson ${gson.version} + @@ -63,6 +68,7 @@ 2.8.0 2.9.6 + 11.0.2 \ No newline at end of file diff --git a/gson/src/main/java/com/baeldung/gson/entities/ActorGson.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/ActorGson.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/ActorGson.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/ActorGson.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Animal.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Animal.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Animal.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Animal.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Cow.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Cow.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Cow.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Cow.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Dog.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Dog.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Dog.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Dog.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Employee.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Employee.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Employee.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Employee.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Movie.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Movie.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Movie.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Movie.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/MovieWithNullValue.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/MovieWithNullValue.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/MovieWithNullValue.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/MovieWithNullValue.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/MyClass.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/MyClass.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/MyClass.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/MyClass.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/User.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/User.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/User.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/User.java diff --git a/gson/src/main/java/com/baeldung/gson/entities/Weather.java b/json-modules/gson/src/main/java/com/baeldung/gson/entities/Weather.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/entities/Weather.java rename to json-modules/gson/src/main/java/com/baeldung/gson/entities/Weather.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/BooleanExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/BooleanExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/BooleanExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/BooleanExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/ByteExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/ByteExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/ByteExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/ByteExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/CharExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/CharExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/CharExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/CharExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/DoubleExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/DoubleExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/DoubleExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/DoubleExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/FloatExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/FloatExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/FloatExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/FloatExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/InfinityValuesExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/InfinityValuesExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/InfinityValuesExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/InfinityValuesExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/LongExample.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/LongExample.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/LongExample.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/LongExample.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundle.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundle.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundle.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundle.java diff --git a/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java b/json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java rename to json-modules/gson/src/main/java/com/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java diff --git a/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonDeserializer.java b/json-modules/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonDeserializer.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serialization/ActorGsonDeserializer.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonDeserializer.java diff --git a/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonSerializer.java b/json-modules/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonSerializer.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serialization/ActorGsonSerializer.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serialization/ActorGsonSerializer.java diff --git a/gson/src/main/java/com/baeldung/gson/serialization/AnimalDeserializer.java b/json-modules/gson/src/main/java/com/baeldung/gson/serialization/AnimalDeserializer.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serialization/AnimalDeserializer.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serialization/AnimalDeserializer.java diff --git a/gson/src/main/java/com/baeldung/gson/serialization/MapDeserializer.java b/json-modules/gson/src/main/java/com/baeldung/gson/serialization/MapDeserializer.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serialization/MapDeserializer.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serialization/MapDeserializer.java diff --git a/gson/src/main/java/com/baeldung/gson/serialization/StringDateMapDeserializer.java b/json-modules/gson/src/main/java/com/baeldung/gson/serialization/StringDateMapDeserializer.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serialization/StringDateMapDeserializer.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serialization/StringDateMapDeserializer.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/Exclude.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/Exclude.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/Exclude.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/Exclude.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClass.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClass.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClass.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClass.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithAnnotatedFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithAnnotatedFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithAnnotatedFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithAnnotatedFields.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithCustomAnnotatedFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithCustomAnnotatedFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithCustomAnnotatedFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithCustomAnnotatedFields.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithTransientFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithTransientFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithTransientFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MyClassWithTransientFields.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClass.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClass.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClass.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClass.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithAnnotatedFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithAnnotatedFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithAnnotatedFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithAnnotatedFields.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithCustomAnnotatedFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithCustomAnnotatedFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithCustomAnnotatedFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithCustomAnnotatedFields.java diff --git a/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithTransientFields.java b/json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithTransientFields.java similarity index 100% rename from gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithTransientFields.java rename to json-modules/gson/src/main/java/com/baeldung/gson/serializationwithexclusions/MySubClassWithTransientFields.java diff --git a/gson/src/main/resources/logback.xml b/json-modules/gson/src/main/resources/logback.xml similarity index 100% rename from gson/src/main/resources/logback.xml rename to json-modules/gson/src/main/resources/logback.xml diff --git a/gson/src/test/java/com/baeldung/gson/advance/GsonAdvanceUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/advance/GsonAdvanceUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/advance/GsonAdvanceUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/advance/GsonAdvanceUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/advance/RuntimeTypeAdapterFactory.java b/json-modules/gson/src/test/java/com/baeldung/gson/advance/RuntimeTypeAdapterFactory.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/advance/RuntimeTypeAdapterFactory.java rename to json-modules/gson/src/test/java/com/baeldung/gson/advance/RuntimeTypeAdapterFactory.java diff --git a/gson/src/test/java/com/baeldung/gson/conversion/JsonObjectConversionsUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/conversion/JsonObjectConversionsUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/conversion/JsonObjectConversionsUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/conversion/JsonObjectConversionsUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/Foo.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/Foo.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/Foo.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/Foo.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializer.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializer.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializer.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializer.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializerFromJsonWithDifferentFields.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializerFromJsonWithDifferentFields.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializerFromJsonWithDifferentFields.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooDeserializerFromJsonWithDifferentFields.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/FooInstanceCreator.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooInstanceCreator.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/FooInstanceCreator.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooInstanceCreator.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/FooWithInner.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooWithInner.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/FooWithInner.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/FooWithInner.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/GenericFoo.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GenericFoo.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/GenericFoo.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GenericFoo.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/GsonAlternateUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GsonAlternateUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/GsonAlternateUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GsonAlternateUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/GsonDeserializeUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GsonDeserializeUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/GsonDeserializeUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/GsonDeserializeUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/MapDeserializationUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/MapDeserializationUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/MapDeserializationUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/MapDeserializationUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/jsoncompare/JsonCompareUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/jsoncompare/JsonCompareUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/jsoncompare/JsonCompareUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/jsoncompare/JsonCompareUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/primitives/PrimitiveValuesUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/primitives/PrimitiveValuesUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/primitives/PrimitiveValuesUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/primitives/PrimitiveValuesUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/DifferentNameSerializer.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/DifferentNameSerializer.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/DifferentNameSerializer.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/DifferentNameSerializer.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsNotMatchingCriteriaSerializer.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsNotMatchingCriteriaSerializer.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsNotMatchingCriteriaSerializer.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsNotMatchingCriteriaSerializer.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsSerializer.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsSerializer.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsSerializer.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/IgnoringFieldsSerializer.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/SourceClass.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/SourceClass.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/SourceClass.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/SourceClass.java diff --git a/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java similarity index 98% rename from gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java index 4780b8a6bf..3b8912d259 100644 --- a/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java +++ b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java @@ -11,10 +11,12 @@ import com.baeldung.gson.serialization.DifferentNameSerializer; import com.baeldung.gson.serialization.IgnoringFieldsNotMatchingCriteriaSerializer; import com.baeldung.gson.serialization.IgnoringFieldsSerializer; import com.baeldung.gson.serialization.SourceClass; + +import org.assertj.core.util.Lists; import org.joda.time.DateTime; import org.junit.Test; -import com.google.common.collect.Lists; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; diff --git a/gson/src/test/java/com/baeldung/gson/serialization/test/JsonFileUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/JsonFileUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serialization/test/JsonFileUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/JsonFileUnitTest.java diff --git a/gson/src/test/java/com/baeldung/gson/serializationwithexclusions/SerializationWithExclusionsUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serializationwithexclusions/SerializationWithExclusionsUnitTest.java similarity index 100% rename from gson/src/test/java/com/baeldung/gson/serializationwithexclusions/SerializationWithExclusionsUnitTest.java rename to json-modules/gson/src/test/java/com/baeldung/gson/serializationwithexclusions/SerializationWithExclusionsUnitTest.java diff --git a/gson/src/test/resources/.gitignore b/json-modules/gson/src/test/resources/.gitignore similarity index 100% rename from gson/src/test/resources/.gitignore rename to json-modules/gson/src/test/resources/.gitignore diff --git a/gson/src/test/resources/logback-test.xml b/json-modules/gson/src/test/resources/logback-test.xml similarity index 100% rename from gson/src/test/resources/logback-test.xml rename to json-modules/gson/src/test/resources/logback-test.xml diff --git a/json-2/README.md b/json-modules/json-2/README.md similarity index 100% rename from json-2/README.md rename to json-modules/json-2/README.md diff --git a/json-2/pom.xml b/json-modules/json-2/pom.xml similarity index 99% rename from json-2/pom.xml rename to json-modules/json-2/pom.xml index 6fbdebc953..5a820978a7 100644 --- a/json-2/pom.xml +++ b/json-modules/json-2/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + json-modules 1.0.0-SNAPSHOT diff --git a/json-2/src/main/java/com/baeldung/jsoniter/model/Name.java b/json-modules/json-2/src/main/java/com/baeldung/jsoniter/model/Name.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsoniter/model/Name.java rename to json-modules/json-2/src/main/java/com/baeldung/jsoniter/model/Name.java diff --git a/json-2/src/main/java/com/baeldung/jsoniter/model/Student.java b/json-modules/json-2/src/main/java/com/baeldung/jsoniter/model/Student.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsoniter/model/Student.java rename to json-modules/json-2/src/main/java/com/baeldung/jsoniter/model/Student.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/Customer.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/Customer.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/Customer.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/Customer.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerDeserializer.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerDeserializer.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerDeserializer.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerDeserializer.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSerializer.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSerializer.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSerializer.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSerializer.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerShortNames.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerShortNames.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerShortNames.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerShortNames.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlim.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlim.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlim.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlim.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimDeserializer.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimDeserializer.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimDeserializer.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimDeserializer.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimSerializer.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimSerializer.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimSerializer.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimSerializer.java diff --git a/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimShortNames.java b/json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimShortNames.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimShortNames.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonoptimization/CustomerSlimShortNames.java diff --git a/json-2/src/main/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversion.java b/json-modules/json-2/src/main/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversion.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversion.java rename to json-modules/json-2/src/main/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversion.java diff --git a/json-2/src/main/java/com/baeldung/jsontojavaclass/pojo/SamplePojo.java b/json-modules/json-2/src/main/java/com/baeldung/jsontojavaclass/pojo/SamplePojo.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsontojavaclass/pojo/SamplePojo.java rename to json-modules/json-2/src/main/java/com/baeldung/jsontojavaclass/pojo/SamplePojo.java diff --git a/json-2/src/main/java/com/baeldung/jsonvalidation/GsonValidator.java b/json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/GsonValidator.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonvalidation/GsonValidator.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/GsonValidator.java diff --git a/json-2/src/main/java/com/baeldung/jsonvalidation/JacksonValidator.java b/json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/JacksonValidator.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonvalidation/JacksonValidator.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/JacksonValidator.java diff --git a/json-2/src/main/java/com/baeldung/jsonvalidation/JsonValidator.java b/json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/JsonValidator.java similarity index 100% rename from json-2/src/main/java/com/baeldung/jsonvalidation/JsonValidator.java rename to json-modules/json-2/src/main/java/com/baeldung/jsonvalidation/JsonValidator.java diff --git a/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Address.java b/json-modules/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Address.java similarity index 100% rename from json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Address.java rename to json-modules/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Address.java diff --git a/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Input.java b/json-modules/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Input.java similarity index 100% rename from json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Input.java rename to json-modules/json-2/src/main/resources/convertedPojo/com/baeldung/jsontojavaclass/pojo/Input.java diff --git a/json-2/src/main/resources/input.json b/json-modules/json-2/src/main/resources/input.json similarity index 100% rename from json-2/src/main/resources/input.json rename to json-modules/json-2/src/main/resources/input.json diff --git a/json-2/src/test/java/com/baeldung/fastjson/FastJsonUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/fastjson/FastJsonUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/fastjson/FastJsonUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/fastjson/FastJsonUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/fastjson/Person.java b/json-modules/json-2/src/test/java/com/baeldung/fastjson/Person.java similarity index 100% rename from json-2/src/test/java/com/baeldung/fastjson/Person.java rename to json-modules/json-2/src/test/java/com/baeldung/fastjson/Person.java diff --git a/json-2/src/test/java/com/baeldung/jsoniter/JsoniterIntroUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsoniter/JsoniterIntroUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsoniter/JsoniterIntroUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsoniter/JsoniterIntroUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java b/json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java diff --git a/json-2/src/test/java/com/baeldung/jsonoptimization/JsonOptimizationUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonoptimization/JsonOptimizationUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonoptimization/JsonOptimizationUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonoptimization/JsonOptimizationUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversionUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversionUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversionUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsontojavaclass/JsonToJavaClassConversionUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonvalidation/GsonValidatorUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/GsonValidatorUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonvalidation/GsonValidatorUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/GsonValidatorUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonvalidation/JacksonValidatorUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/JacksonValidatorUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonvalidation/JacksonValidatorUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/JacksonValidatorUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/jsonvalidation/JsonValidatorUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/JsonValidatorUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/jsonvalidation/JsonValidatorUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/jsonvalidation/JsonValidatorUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/AlternativeAdapterUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/ArrayUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/ComplexAdapterUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/DefaultUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/PrimitiveUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/RenameUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/SimpleAdapterUnitTest.java diff --git a/json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java b/json-modules/json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java similarity index 100% rename from json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java rename to json-modules/json-2/src/test/java/com/baeldung/moshi/TransientUnitTest.java diff --git a/json-2/src/test/resources/Student.json b/json-modules/json-2/src/test/resources/Student.json similarity index 100% rename from json-2/src/test/resources/Student.json rename to json-modules/json-2/src/test/resources/Student.json diff --git a/json-2/src/test/resources/com/baeldung/jsontojavaclass/pojo/SamplePojo.java b/json-modules/json-2/src/test/resources/com/baeldung/jsontojavaclass/pojo/SamplePojo.java similarity index 100% rename from json-2/src/test/resources/com/baeldung/jsontojavaclass/pojo/SamplePojo.java rename to json-modules/json-2/src/test/resources/com/baeldung/jsontojavaclass/pojo/SamplePojo.java diff --git a/json-2/src/test/resources/json_optimization_mock_data.json b/json-modules/json-2/src/test/resources/json_optimization_mock_data.json similarity index 100% rename from json-2/src/test/resources/json_optimization_mock_data.json rename to json-modules/json-2/src/test/resources/json_optimization_mock_data.json diff --git a/json-2/src/test/resources/sample_input.json b/json-modules/json-2/src/test/resources/sample_input.json similarity index 100% rename from json-2/src/test/resources/sample_input.json rename to json-modules/json-2/src/test/resources/sample_input.json diff --git a/json-path/.gitignore b/json-modules/json-path/.gitignore similarity index 100% rename from json-path/.gitignore rename to json-modules/json-path/.gitignore diff --git a/json-path/README.md b/json-modules/json-path/README.md similarity index 100% rename from json-path/README.md rename to json-modules/json-path/README.md diff --git a/json-path/pom.xml b/json-modules/json-path/pom.xml similarity index 93% rename from json-path/pom.xml rename to json-modules/json-path/pom.xml index b4577ec15f..e467ee9557 100644 --- a/json-path/pom.xml +++ b/json-modules/json-path/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + json-modules 1.0.0-SNAPSHOT diff --git a/json-path/src/main/resources/intro_api.json b/json-modules/json-path/src/main/resources/intro_api.json similarity index 100% rename from json-path/src/main/resources/intro_api.json rename to json-modules/json-path/src/main/resources/intro_api.json diff --git a/json-path/src/main/resources/intro_service.json b/json-modules/json-path/src/main/resources/intro_service.json similarity index 100% rename from json-path/src/main/resources/intro_service.json rename to json-modules/json-path/src/main/resources/intro_service.json diff --git a/json-path/src/main/resources/intro_user.json b/json-modules/json-path/src/main/resources/intro_user.json similarity index 100% rename from json-path/src/main/resources/intro_user.json rename to json-modules/json-path/src/main/resources/intro_user.json diff --git a/json-path/src/main/resources/logback.xml b/json-modules/json-path/src/main/resources/logback.xml similarity index 100% rename from json-path/src/main/resources/logback.xml rename to json-modules/json-path/src/main/resources/logback.xml diff --git a/json-path/src/main/resources/online_store.json b/json-modules/json-path/src/main/resources/online_store.json similarity index 95% rename from json-path/src/main/resources/online_store.json rename to json-modules/json-path/src/main/resources/online_store.json index c0ddf274d8..2b271a1124 100644 --- a/json-path/src/main/resources/online_store.json +++ b/json-modules/json-path/src/main/resources/online_store.json @@ -1,23 +1,23 @@ -{ - "items":{ - "book":[ - { - "author":"Arthur Conan Doyle", - "title":"Sherlock Holmes", - "price":8.99 - }, - { - "author":"J. R. R. Tolkien", - "title":"The Lord of the Rings", - "isbn":"0-395-19395-8", - "price":22.99 - } - ], - "bicycle":{ - "color":"red", - "price":19.95 - } - }, - "url":"mystore.com", - "owner":"baeldung" +{ + "items":{ + "book":[ + { + "author":"Arthur Conan Doyle", + "title":"Sherlock Holmes", + "price":8.99 + }, + { + "author":"J. R. R. Tolkien", + "title":"The Lord of the Rings", + "isbn":"0-395-19395-8", + "price":22.99 + } + ], + "bicycle":{ + "color":"red", + "price":19.95 + } + }, + "url":"mystore.com", + "owner":"baeldung" } \ No newline at end of file diff --git a/json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java similarity index 96% rename from json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java rename to json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java index 3408629a6d..9ffe027b6f 100644 --- a/json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java +++ b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/JsonPathUnitTest.java @@ -1,46 +1,46 @@ -package com.baeldung.jsonpath.introduction; - -import static org.junit.Assert.assertEquals; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.Map; - -import org.junit.BeforeClass; -import org.junit.Test; - -import com.jayway.jsonpath.JsonPath; - -import net.minidev.json.JSONArray; - -public class JsonPathUnitTest { - - private static String json; - private static File jsonFile = new File("src/main/resources/online_store.json"); - - private static String readFile(File file, Charset charset) throws IOException { - return new String(Files.readAllBytes(file.toPath()), charset); - } - - @BeforeClass - public static void init() throws IOException { - json = readFile(jsonFile, StandardCharsets.UTF_8); - } - - @Test - public void shouldMatchCountOfObjects() { - Map objectMap = JsonPath.read(json, "$"); - assertEquals(3, objectMap.keySet() - .size()); - } - - @Test - public void shouldMatchCountOfArrays() { - JSONArray jsonArray = JsonPath.read(json, "$.items.book[*]"); - assertEquals(2, jsonArray.size()); - } - -} +package com.baeldung.jsonpath.introduction; + +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Map; + +import org.junit.BeforeClass; +import org.junit.Test; + +import com.jayway.jsonpath.JsonPath; + +import net.minidev.json.JSONArray; + +public class JsonPathUnitTest { + + private static String json; + private static File jsonFile = new File("src/main/resources/online_store.json"); + + private static String readFile(File file, Charset charset) throws IOException { + return new String(Files.readAllBytes(file.toPath()), charset); + } + + @BeforeClass + public static void init() throws IOException { + json = readFile(jsonFile, StandardCharsets.UTF_8); + } + + @Test + public void shouldMatchCountOfObjects() { + Map objectMap = JsonPath.read(json, "$"); + assertEquals(3, objectMap.keySet() + .size()); + } + + @Test + public void shouldMatchCountOfArrays() { + JSONArray jsonArray = JsonPath.read(json, "$.items.book[*]"); + assertEquals(2, jsonArray.size()); + } + +} diff --git a/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java similarity index 100% rename from json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java rename to json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java diff --git a/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java similarity index 100% rename from json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java rename to json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java diff --git a/json-path/src/test/resources/logback.xml b/json-modules/json-path/src/test/resources/logback.xml similarity index 100% rename from json-path/src/test/resources/logback.xml rename to json-modules/json-path/src/test/resources/logback.xml diff --git a/json/README.md b/json-modules/json/README.md similarity index 100% rename from json/README.md rename to json-modules/json/README.md diff --git a/json/pom.xml b/json-modules/json/pom.xml similarity index 95% rename from json/pom.xml rename to json-modules/json/pom.xml index 87bbad460a..04a00598a3 100644 --- a/json/pom.xml +++ b/json-modules/json/pom.xml @@ -1,84 +1,84 @@ - - - 4.0.0 - org.baeldung - json - 0.0.1-SNAPSHOT - json - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - org.everit.json - org.everit.json.schema - ${everit.json.schema.version} - - - commons-logging - commons-logging - - - - - org.json - json - ${json.version} - - - com.google.code.gson - gson - ${gson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - javax.json.bind - javax.json.bind-api - ${jsonb-api.version} - - - org.glassfish - javax.json - ${javax.version} - - - org.eclipse - yasson - ${yasson.version} - - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - test - - - net.javacrumbs.json-unit - json-unit-assertj - ${json-unit-assertj.version} - test - - - - - 1.4.1 - 1.0 - 1.0.1 - 20211205 - 2.8.5 - 1.1.2 - 2.28.0 - - + + + 4.0.0 + org.baeldung + json + 0.0.1-SNAPSHOT + json + + + com.baeldung + json-modules + 1.0.0-SNAPSHOT + + + + + org.everit.json + org.everit.json.schema + ${everit.json.schema.version} + + + commons-logging + commons-logging + + + + + org.json + json + ${json.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + javax.json.bind + javax.json.bind-api + ${jsonb-api.version} + + + org.glassfish + javax.json + ${javax.version} + + + org.eclipse + yasson + ${yasson.version} + + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + test + + + net.javacrumbs.json-unit + json-unit-assertj + ${json-unit-assertj.version} + test + + + + + 1.4.1 + 1.0 + 1.0.1 + 20211205 + 2.8.5 + 1.1.2 + 2.28.0 + + \ No newline at end of file diff --git a/json/src/main/java/com/baeldung/adapter/PersonAdapter.java b/json-modules/json/src/main/java/com/baeldung/adapter/PersonAdapter.java similarity index 100% rename from json/src/main/java/com/baeldung/adapter/PersonAdapter.java rename to json-modules/json/src/main/java/com/baeldung/adapter/PersonAdapter.java diff --git a/json/src/main/java/com/baeldung/escape/JsonEscape.java b/json-modules/json/src/main/java/com/baeldung/escape/JsonEscape.java similarity index 100% rename from json/src/main/java/com/baeldung/escape/JsonEscape.java rename to json-modules/json/src/main/java/com/baeldung/escape/JsonEscape.java diff --git a/json/src/main/java/com/baeldung/jsonb/Person.java b/json-modules/json/src/main/java/com/baeldung/jsonb/Person.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonb/Person.java rename to json-modules/json/src/main/java/com/baeldung/jsonb/Person.java diff --git a/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/CDLDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/CDLDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/CookieDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/CookieDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/DemoBean.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/DemoBean.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/DemoBean.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/DemoBean.java diff --git a/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/HTTPDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/JSONArrayDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONArrayGetValueByKey.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/JSONArrayGetValueByKey.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/JSONArrayGetValueByKey.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/JSONArrayGetValueByKey.java diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/JSONObjectDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/JSONTokenerDemo.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/JSONTokenerDemo.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/JSONTokenerDemo.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/JSONTokenerDemo.java diff --git a/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java b/json-modules/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java rename to json-modules/json/src/main/java/com/baeldung/jsonjava/ObjectToFromJSON.java diff --git a/json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java b/json-modules/json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java similarity index 96% rename from json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java rename to json-modules/json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java index 0ff8650652..0d3ae3b021 100644 --- a/json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java +++ b/json-modules/json/src/main/java/com/baeldung/jsonobject/iterate/JSONObjectIterator.java @@ -1,50 +1,50 @@ -package com.baeldung.jsonobject.iterate; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONObject; - -public class JSONObjectIterator { - - private Map keyValuePairs; - - public JSONObjectIterator() { - keyValuePairs = new HashMap<>(); - } - - public void handleValue(String key, Object value) { - if (value instanceof JSONArray) { - handleJSONArray(key, (JSONArray) value); - } else if (value instanceof JSONObject) { - handleJSONObject((JSONObject) value); - } - keyValuePairs.put(key, value); - } - - public void handleJSONObject(JSONObject jsonObject) { - Iterator jsonObjectIterator = jsonObject.keys(); - jsonObjectIterator.forEachRemaining(key -> { - Object value = jsonObject.get(key); - handleValue(key, value); - }); - } - - public void handleJSONArray(String key, JSONArray jsonArray) { - Iterator jsonArrayIterator = jsonArray.iterator(); - jsonArrayIterator.forEachRemaining(element -> { - handleValue(key, element); - }); - } - - public Map getKeyValuePairs() { - return keyValuePairs; - } - - public void setKeyValuePairs(Map keyValuePairs) { - this.keyValuePairs = keyValuePairs; - } - -} +package com.baeldung.jsonobject.iterate; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.json.JSONArray; +import org.json.JSONObject; + +public class JSONObjectIterator { + + private Map keyValuePairs; + + public JSONObjectIterator() { + keyValuePairs = new HashMap<>(); + } + + public void handleValue(String key, Object value) { + if (value instanceof JSONArray) { + handleJSONArray(key, (JSONArray) value); + } else if (value instanceof JSONObject) { + handleJSONObject((JSONObject) value); + } + keyValuePairs.put(key, value); + } + + public void handleJSONObject(JSONObject jsonObject) { + Iterator jsonObjectIterator = jsonObject.keys(); + jsonObjectIterator.forEachRemaining(key -> { + Object value = jsonObject.get(key); + handleValue(key, value); + }); + } + + public void handleJSONArray(String key, JSONArray jsonArray) { + Iterator jsonArrayIterator = jsonArray.iterator(); + jsonArrayIterator.forEachRemaining(element -> { + handleValue(key, element); + }); + } + + public Map getKeyValuePairs() { + return keyValuePairs; + } + + public void setKeyValuePairs(Map keyValuePairs) { + this.keyValuePairs = keyValuePairs; + } + +} diff --git a/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java b/json-modules/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java similarity index 100% rename from json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java rename to json-modules/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java diff --git a/json/src/main/resources/logback.xml b/json-modules/json/src/main/resources/logback.xml similarity index 100% rename from json/src/main/resources/logback.xml rename to json-modules/json/src/main/resources/logback.xml diff --git a/json/src/main/webapp/index.html b/json-modules/json/src/main/webapp/index.html similarity index 100% rename from json/src/main/webapp/index.html rename to json-modules/json/src/main/webapp/index.html diff --git a/json/src/main/webapp/js/app.js b/json-modules/json/src/main/webapp/js/app.js similarity index 100% rename from json/src/main/webapp/js/app.js rename to json-modules/json/src/main/webapp/js/app.js diff --git a/json/src/main/webapp/js/schema.js b/json-modules/json/src/main/webapp/js/schema.js similarity index 100% rename from json/src/main/webapp/js/schema.js rename to json-modules/json/src/main/webapp/js/schema.js diff --git a/json/src/main/webapp/js/ui-schema.js b/json-modules/json/src/main/webapp/js/ui-schema.js similarity index 100% rename from json/src/main/webapp/js/ui-schema.js rename to json-modules/json/src/main/webapp/js/ui-schema.js diff --git a/json/src/main/webapp/package.json b/json-modules/json/src/main/webapp/package.json similarity index 95% rename from json/src/main/webapp/package.json rename to json-modules/json/src/main/webapp/package.json index 2f2d6c9ffa..5dae000593 100644 --- a/json/src/main/webapp/package.json +++ b/json-modules/json/src/main/webapp/package.json @@ -1,11 +1,11 @@ -{ - "name": "jsonforms-intro", - "description": "Introduction to JSONForms", - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "typings": "0.6.5", - "jsonforms": "0.0.19", - "bootstrap": "3.3.6" - } +{ + "name": "jsonforms-intro", + "description": "Introduction to JSONForms", + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "typings": "0.6.5", + "jsonforms": "0.0.19", + "bootstrap": "3.3.6" + } } \ No newline at end of file diff --git a/json/src/test/java/com/baeldung/escape/JsonEscapeUnitTest.java b/json-modules/json/src/test/java/com/baeldung/escape/JsonEscapeUnitTest.java similarity index 100% rename from json/src/test/java/com/baeldung/escape/JsonEscapeUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/escape/JsonEscapeUnitTest.java diff --git a/json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java b/json-modules/json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java similarity index 100% rename from json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java diff --git a/json/src/test/java/com/baeldung/jsonb/JsonbUnitTest.java b/json-modules/json/src/test/java/com/baeldung/jsonb/JsonbUnitTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonb/JsonbUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonb/JsonbUnitTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/CDLIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/CDLIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/CDLIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/CDLIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/CookieIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/CookieIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/CookieIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/CookieIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/HTTPIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/HTTPIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/HTTPIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/HTTPIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/JSONArrayGetValueByKeyUnitTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/JSONArrayGetValueByKeyUnitTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/JSONArrayGetValueByKeyUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/JSONArrayGetValueByKeyUnitTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/JSONArrayIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/JSONArrayIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/JSONArrayIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/JSONArrayIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/JSONObjectIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/JSONTokenerIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/JSONTokenerIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/JSONTokenerIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/JSONTokenerIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java b/json-modules/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonjava/ObjectToFromJSONIntegrationTest.java diff --git a/json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java b/json-modules/json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java similarity index 97% rename from json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java index 55cfdab53b..fa51c83e04 100644 --- a/json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java +++ b/json-modules/json/src/test/java/com/baeldung/jsonobject/iterate/JSONObjectIteratorUnitTest.java @@ -1,79 +1,79 @@ -package com.baeldung.jsonobject.iterate; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.junit.Test; - -public class JSONObjectIteratorUnitTest { - - private JSONObjectIterator jsonObjectIterator = new JSONObjectIterator(); - - @Test - public void givenJSONObject_whenIterating_thenGetKeyValuePairs() { - JSONObject jsonObject = getJsonObject(); - - jsonObjectIterator.handleJSONObject(jsonObject); - - Map keyValuePairs = jsonObjectIterator.getKeyValuePairs(); - assertThat(keyValuePairs.get("rType")).isEqualTo("Regular"); - assertThat(keyValuePairs.get("rId")).isEqualTo("1001"); - assertThat(keyValuePairs.get("cType")).isEqualTo("Chocolate"); - assertThat(keyValuePairs.get("cId")).isEqualTo("1002"); - assertThat(keyValuePairs.get("bType")).isEqualTo("BlueBerry"); - assertThat(keyValuePairs.get("bId")).isEqualTo("1003"); - assertThat(keyValuePairs.get("name")).isEqualTo("Cake"); - assertThat(keyValuePairs.get("cakeId")).isEqualTo("0001"); - assertThat(keyValuePairs.get("type")).isEqualTo("donut"); - assertThat(keyValuePairs.get("Type")).isEqualTo("Maple"); - assertThat(keyValuePairs.get("tId")).isEqualTo("5001"); - assertThat(keyValuePairs.get("batters") - .toString()).isEqualTo("[{\"rType\":\"Regular\",\"rId\":\"1001\"},{\"cType\":\"Chocolate\",\"cId\":\"1002\"},{\"bType\":\"BlueBerry\",\"bId\":\"1003\"}]"); - assertThat(keyValuePairs.get("cakeShapes") - .toString()).isEqualTo("[\"square\",\"circle\",\"heart\"]"); - assertThat(keyValuePairs.get("topping") - .toString()).isEqualTo("{\"Type\":\"Maple\",\"tId\":\"5001\"}"); - } - - private JSONObject getJsonObject() { - JSONObject cake = new JSONObject(); - cake.put("cakeId", "0001"); - cake.put("type", "donut"); - cake.put("name", "Cake"); - - JSONArray batters = new JSONArray(); - JSONObject regular = new JSONObject(); - regular.put("rId", "1001"); - regular.put("rType", "Regular"); - batters.put(regular); - JSONObject chocolate = new JSONObject(); - chocolate.put("cId", "1002"); - chocolate.put("cType", "Chocolate"); - batters.put(chocolate); - JSONObject blueberry = new JSONObject(); - blueberry.put("bId", "1003"); - blueberry.put("bType", "BlueBerry"); - batters.put(blueberry); - - JSONArray cakeShapes = new JSONArray(); - cakeShapes.put("square"); - cakeShapes.put("circle"); - cakeShapes.put("heart"); - - cake.put("cakeShapes", cakeShapes); - - cake.put("batters", batters); - - JSONObject topping = new JSONObject(); - topping.put("tId", "5001"); - topping.put("Type", "Maple"); - - cake.put("topping", topping); - - return cake; - } - -} +package com.baeldung.jsonobject.iterate; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Map; + +import org.json.JSONArray; +import org.json.JSONObject; +import org.junit.Test; + +public class JSONObjectIteratorUnitTest { + + private JSONObjectIterator jsonObjectIterator = new JSONObjectIterator(); + + @Test + public void givenJSONObject_whenIterating_thenGetKeyValuePairs() { + JSONObject jsonObject = getJsonObject(); + + jsonObjectIterator.handleJSONObject(jsonObject); + + Map keyValuePairs = jsonObjectIterator.getKeyValuePairs(); + assertThat(keyValuePairs.get("rType")).isEqualTo("Regular"); + assertThat(keyValuePairs.get("rId")).isEqualTo("1001"); + assertThat(keyValuePairs.get("cType")).isEqualTo("Chocolate"); + assertThat(keyValuePairs.get("cId")).isEqualTo("1002"); + assertThat(keyValuePairs.get("bType")).isEqualTo("BlueBerry"); + assertThat(keyValuePairs.get("bId")).isEqualTo("1003"); + assertThat(keyValuePairs.get("name")).isEqualTo("Cake"); + assertThat(keyValuePairs.get("cakeId")).isEqualTo("0001"); + assertThat(keyValuePairs.get("type")).isEqualTo("donut"); + assertThat(keyValuePairs.get("Type")).isEqualTo("Maple"); + assertThat(keyValuePairs.get("tId")).isEqualTo("5001"); + assertThat(keyValuePairs.get("batters") + .toString()).isEqualTo("[{\"rType\":\"Regular\",\"rId\":\"1001\"},{\"cType\":\"Chocolate\",\"cId\":\"1002\"},{\"bType\":\"BlueBerry\",\"bId\":\"1003\"}]"); + assertThat(keyValuePairs.get("cakeShapes") + .toString()).isEqualTo("[\"square\",\"circle\",\"heart\"]"); + assertThat(keyValuePairs.get("topping") + .toString()).isEqualTo("{\"Type\":\"Maple\",\"tId\":\"5001\"}"); + } + + private JSONObject getJsonObject() { + JSONObject cake = new JSONObject(); + cake.put("cakeId", "0001"); + cake.put("type", "donut"); + cake.put("name", "Cake"); + + JSONArray batters = new JSONArray(); + JSONObject regular = new JSONObject(); + regular.put("rId", "1001"); + regular.put("rType", "Regular"); + batters.put(regular); + JSONObject chocolate = new JSONObject(); + chocolate.put("cId", "1002"); + chocolate.put("cType", "Chocolate"); + batters.put(chocolate); + JSONObject blueberry = new JSONObject(); + blueberry.put("bId", "1003"); + blueberry.put("bType", "BlueBerry"); + batters.put(blueberry); + + JSONArray cakeShapes = new JSONArray(); + cakeShapes.put("square"); + cakeShapes.put("circle"); + cakeShapes.put("heart"); + + cake.put("cakeShapes", cakeShapes); + + cake.put("batters", batters); + + JSONObject topping = new JSONObject(); + topping.put("tId", "5001"); + topping.put("Type", "Maple"); + + cake.put("topping", topping); + + return cake; + } + +} diff --git a/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java b/json-modules/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java similarity index 100% rename from json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java rename to json-modules/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java diff --git a/json/src/test/resources/address.json b/json-modules/json/src/test/resources/address.json similarity index 100% rename from json/src/test/resources/address.json rename to json-modules/json/src/test/resources/address.json diff --git a/json/src/test/resources/books.json b/json-modules/json/src/test/resources/books.json similarity index 100% rename from json/src/test/resources/books.json rename to json-modules/json/src/test/resources/books.json diff --git a/json/src/test/resources/product_invalid.json b/json-modules/json/src/test/resources/product_invalid.json similarity index 91% rename from json/src/test/resources/product_invalid.json rename to json-modules/json/src/test/resources/product_invalid.json index 7c55d8c7a5..96d792aca8 100644 --- a/json/src/test/resources/product_invalid.json +++ b/json-modules/json/src/test/resources/product_invalid.json @@ -1,5 +1,5 @@ -{ - "id": 1, - "name": "Lampshade", - "price": 0 -} +{ + "id": 1, + "name": "Lampshade", + "price": 0 +} diff --git a/json/src/test/resources/product_valid.json b/json-modules/json/src/test/resources/product_valid.json similarity index 92% rename from json/src/test/resources/product_valid.json rename to json-modules/json/src/test/resources/product_valid.json index e0697dc4c2..5095029d4c 100644 --- a/json/src/test/resources/product_valid.json +++ b/json-modules/json/src/test/resources/product_valid.json @@ -1,5 +1,5 @@ -{ - "id": 1, - "name": "Lampshade", - "price": 10 -} +{ + "id": 1, + "name": "Lampshade", + "price": 10 +} diff --git a/json/src/test/resources/schema.json b/json-modules/json/src/test/resources/schema.json similarity index 96% rename from json/src/test/resources/schema.json rename to json-modules/json/src/test/resources/schema.json index 7cf99d76e0..ce513f82c4 100644 --- a/json/src/test/resources/schema.json +++ b/json-modules/json/src/test/resources/schema.json @@ -1,22 +1,22 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Product", - "description": "A product from the catalog", - "type": "object", - "properties": { - "id": { - "description": "The unique identifier for a product", - "type": "integer" - }, - "name": { - "description": "Name of the product", - "type": "string" - }, - "price": { - "type": "number", - "minimum": 0, - "exclusiveMinimum": true - } - }, - "required": ["id", "name", "price"] -} +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Product", + "description": "A product from the catalog", + "type": "object", + "properties": { + "id": { + "description": "The unique identifier for a product", + "type": "integer" + }, + "name": { + "description": "Name of the product", + "type": "string" + }, + "price": { + "type": "number", + "minimum": 0, + "exclusiveMinimum": true + } + }, + "required": ["id", "name", "price"] +} diff --git a/json-modules/pom.xml b/json-modules/pom.xml new file mode 100644 index 0000000000..6d18738a51 --- /dev/null +++ b/json-modules/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + json-modules + 1.0.0-SNAPSHOT + json-modules + pom + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + + + json + json-2 + json-path + gson + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4b96a48fc0..a486b0d17c 100644 --- a/pom.xml +++ b/pom.xml @@ -404,7 +404,6 @@ graphql-modules grpc - gson guava-modules guice @@ -447,9 +446,7 @@ java-native jooby jsf - json - json-2 - json-path + json-modules jsoup kubernetes ksqldb @@ -844,7 +841,6 @@ graphql-modules grpc - gson guava-modules guice @@ -887,9 +883,7 @@ java-native jooby jsf - json - json-2 - json-path + json-modules jsoup ksqldb From 26e3b1d3b2bd2fca26aedae802c3c801be6c75dc Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Fri, 24 Jun 2022 22:13:17 +0530 Subject: [PATCH 47/86] Update README.md (#12408) --- json-modules/json-2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json-modules/json-2/README.md b/json-modules/json-2/README.md index b3e7fb0b94..65bc6d5bd9 100644 --- a/json-modules/json-2/README.md +++ b/json-modules/json-2/README.md @@ -10,4 +10,4 @@ This module contains articles about JSON. - [Generate a Java Class From JSON](https://www.baeldung.com/java-generate-class-from-json) - [A Guide to FastJson](https://www.baeldung.com/fastjson) - [Check Whether a String is Valid JSON in Java](https://www.baeldung.com/java-validate-json-string) -- More Articles: [[<-- prev]](/json) +- More Articles: [[<-- prev]](/json-modules/json) From 1ee4a09b2e5dba0e3ffd5f18abc2f158f97030e8 Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Fri, 24 Jun 2022 17:56:57 +0100 Subject: [PATCH 48/86] Java 11501 (#12405) * added parent module (akka-modules) * moved akka-http(submodule) to akka-modules(parent) * moved akka-streams(submodule) to akka-modules(parent) * moved spring-akka(submodule) to akka-modules(parent) * deleted submodules that we moved to akka-modules Co-authored-by: panagiotiskakos --- akka-modules/README.md | 3 ++ .../akka-http}/README.md | 0 {akka-http => akka-modules/akka-http}/pom.xml | 2 +- .../main/java/com/baeldung/akkahttp/User.java | 0 .../java/com/baeldung/akkahttp/UserActor.java | 0 .../com/baeldung/akkahttp/UserMessages.java | 0 .../com/baeldung/akkahttp/UserServer.java | 0 .../com/baeldung/akkahttp/UserService.java | 0 .../baeldung/akkahttp/UserServerUnitTest.java | 0 .../akka-streams}/README.md | 0 .../akka-streams}/pom.xml | 2 +- .../akkastreams/AverageRepository.java | 0 .../baeldung/akkastreams/DataImporter.java | 0 .../src/main/resources/logback.xml | 0 .../akkastreams/DataImporterUnitTest.java | 0 akka-modules/pom.xml | 34 +++++++++++++++++++ .../spring-akka}/README.md | 0 .../spring-akka}/pom.xml | 2 +- .../com/baeldung/akka/AppConfiguration.java | 0 .../java/com/baeldung/akka/GreetingActor.java | 0 .../com/baeldung/akka/GreetingService.java | 0 .../baeldung/akka/SpringActorProducer.java | 0 .../com/baeldung/akka/SpringExtension.java | 0 .../src/main/resources/logback.xml | 0 .../akka/SpringAkkaIntegrationTest.java | 0 pom.xml | 8 ++--- 26 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 akka-modules/README.md rename {akka-http => akka-modules/akka-http}/README.md (100%) rename {akka-http => akka-modules/akka-http}/pom.xml (96%) rename {akka-http => akka-modules/akka-http}/src/main/java/com/baeldung/akkahttp/User.java (100%) rename {akka-http => akka-modules/akka-http}/src/main/java/com/baeldung/akkahttp/UserActor.java (100%) rename {akka-http => akka-modules/akka-http}/src/main/java/com/baeldung/akkahttp/UserMessages.java (100%) rename {akka-http => akka-modules/akka-http}/src/main/java/com/baeldung/akkahttp/UserServer.java (100%) rename {akka-http => akka-modules/akka-http}/src/main/java/com/baeldung/akkahttp/UserService.java (100%) rename {akka-http => akka-modules/akka-http}/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java (100%) rename {akka-streams => akka-modules/akka-streams}/README.md (100%) rename {akka-streams => akka-modules/akka-streams}/pom.xml (94%) rename {akka-streams => akka-modules/akka-streams}/src/main/java/com/baeldung/akkastreams/AverageRepository.java (100%) rename {akka-streams => akka-modules/akka-streams}/src/main/java/com/baeldung/akkastreams/DataImporter.java (100%) rename {akka-streams => akka-modules/akka-streams}/src/main/resources/logback.xml (100%) rename {akka-streams => akka-modules/akka-streams}/src/test/java/com/baeldung/akkastreams/DataImporterUnitTest.java (100%) create mode 100644 akka-modules/pom.xml rename {spring-akka => akka-modules/spring-akka}/README.md (100%) rename {spring-akka => akka-modules/spring-akka}/pom.xml (96%) rename {spring-akka => akka-modules/spring-akka}/src/main/java/com/baeldung/akka/AppConfiguration.java (100%) rename {spring-akka => akka-modules/spring-akka}/src/main/java/com/baeldung/akka/GreetingActor.java (100%) rename {spring-akka => akka-modules/spring-akka}/src/main/java/com/baeldung/akka/GreetingService.java (100%) rename {spring-akka => akka-modules/spring-akka}/src/main/java/com/baeldung/akka/SpringActorProducer.java (100%) rename {spring-akka => akka-modules/spring-akka}/src/main/java/com/baeldung/akka/SpringExtension.java (100%) rename {spring-akka => akka-modules/spring-akka}/src/main/resources/logback.xml (100%) rename {spring-akka => akka-modules/spring-akka}/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java (100%) diff --git a/akka-modules/README.md b/akka-modules/README.md new file mode 100644 index 0000000000..b85789407f --- /dev/null +++ b/akka-modules/README.md @@ -0,0 +1,3 @@ +## Akka + +This module contains modules about Akka. \ No newline at end of file diff --git a/akka-http/README.md b/akka-modules/akka-http/README.md similarity index 100% rename from akka-http/README.md rename to akka-modules/akka-http/README.md diff --git a/akka-http/pom.xml b/akka-modules/akka-http/pom.xml similarity index 96% rename from akka-http/pom.xml rename to akka-modules/akka-http/pom.xml index a64d7a80f6..cf7e0b95ab 100644 --- a/akka-http/pom.xml +++ b/akka-modules/akka-http/pom.xml @@ -8,7 +8,7 @@ com.baeldung - parent-modules + akka-modules 1.0.0-SNAPSHOT diff --git a/akka-http/src/main/java/com/baeldung/akkahttp/User.java b/akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/User.java similarity index 100% rename from akka-http/src/main/java/com/baeldung/akkahttp/User.java rename to akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/User.java diff --git a/akka-http/src/main/java/com/baeldung/akkahttp/UserActor.java b/akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserActor.java similarity index 100% rename from akka-http/src/main/java/com/baeldung/akkahttp/UserActor.java rename to akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserActor.java diff --git a/akka-http/src/main/java/com/baeldung/akkahttp/UserMessages.java b/akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserMessages.java similarity index 100% rename from akka-http/src/main/java/com/baeldung/akkahttp/UserMessages.java rename to akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserMessages.java diff --git a/akka-http/src/main/java/com/baeldung/akkahttp/UserServer.java b/akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserServer.java similarity index 100% rename from akka-http/src/main/java/com/baeldung/akkahttp/UserServer.java rename to akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserServer.java diff --git a/akka-http/src/main/java/com/baeldung/akkahttp/UserService.java b/akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserService.java similarity index 100% rename from akka-http/src/main/java/com/baeldung/akkahttp/UserService.java rename to akka-modules/akka-http/src/main/java/com/baeldung/akkahttp/UserService.java diff --git a/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java b/akka-modules/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java similarity index 100% rename from akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java rename to akka-modules/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java diff --git a/akka-streams/README.md b/akka-modules/akka-streams/README.md similarity index 100% rename from akka-streams/README.md rename to akka-modules/akka-streams/README.md diff --git a/akka-streams/pom.xml b/akka-modules/akka-streams/pom.xml similarity index 94% rename from akka-streams/pom.xml rename to akka-modules/akka-streams/pom.xml index f92b37fcb4..b563d07400 100644 --- a/akka-streams/pom.xml +++ b/akka-modules/akka-streams/pom.xml @@ -8,7 +8,7 @@ com.baeldung - parent-modules + akka-modules 1.0.0-SNAPSHOT diff --git a/akka-streams/src/main/java/com/baeldung/akkastreams/AverageRepository.java b/akka-modules/akka-streams/src/main/java/com/baeldung/akkastreams/AverageRepository.java similarity index 100% rename from akka-streams/src/main/java/com/baeldung/akkastreams/AverageRepository.java rename to akka-modules/akka-streams/src/main/java/com/baeldung/akkastreams/AverageRepository.java diff --git a/akka-streams/src/main/java/com/baeldung/akkastreams/DataImporter.java b/akka-modules/akka-streams/src/main/java/com/baeldung/akkastreams/DataImporter.java similarity index 100% rename from akka-streams/src/main/java/com/baeldung/akkastreams/DataImporter.java rename to akka-modules/akka-streams/src/main/java/com/baeldung/akkastreams/DataImporter.java diff --git a/akka-streams/src/main/resources/logback.xml b/akka-modules/akka-streams/src/main/resources/logback.xml similarity index 100% rename from akka-streams/src/main/resources/logback.xml rename to akka-modules/akka-streams/src/main/resources/logback.xml diff --git a/akka-streams/src/test/java/com/baeldung/akkastreams/DataImporterUnitTest.java b/akka-modules/akka-streams/src/test/java/com/baeldung/akkastreams/DataImporterUnitTest.java similarity index 100% rename from akka-streams/src/test/java/com/baeldung/akkastreams/DataImporterUnitTest.java rename to akka-modules/akka-streams/src/test/java/com/baeldung/akkastreams/DataImporterUnitTest.java diff --git a/akka-modules/pom.xml b/akka-modules/pom.xml new file mode 100644 index 0000000000..bb182b38bb --- /dev/null +++ b/akka-modules/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + akka-modules + 1.0.0-SNAPSHOT + akka-modules + pom + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + + + akka-http + akka-streams + spring-akka + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + \ No newline at end of file diff --git a/spring-akka/README.md b/akka-modules/spring-akka/README.md similarity index 100% rename from spring-akka/README.md rename to akka-modules/spring-akka/README.md diff --git a/spring-akka/pom.xml b/akka-modules/spring-akka/pom.xml similarity index 96% rename from spring-akka/pom.xml rename to akka-modules/spring-akka/pom.xml index fb7a6198c3..c43d850462 100644 --- a/spring-akka/pom.xml +++ b/akka-modules/spring-akka/pom.xml @@ -9,7 +9,7 @@ com.baeldung - parent-modules + akka-modules 1.0.0-SNAPSHOT diff --git a/spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java b/akka-modules/spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java similarity index 100% rename from spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java rename to akka-modules/spring-akka/src/main/java/com/baeldung/akka/AppConfiguration.java diff --git a/spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java b/akka-modules/spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java similarity index 100% rename from spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java rename to akka-modules/spring-akka/src/main/java/com/baeldung/akka/GreetingActor.java diff --git a/spring-akka/src/main/java/com/baeldung/akka/GreetingService.java b/akka-modules/spring-akka/src/main/java/com/baeldung/akka/GreetingService.java similarity index 100% rename from spring-akka/src/main/java/com/baeldung/akka/GreetingService.java rename to akka-modules/spring-akka/src/main/java/com/baeldung/akka/GreetingService.java diff --git a/spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java b/akka-modules/spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java similarity index 100% rename from spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java rename to akka-modules/spring-akka/src/main/java/com/baeldung/akka/SpringActorProducer.java diff --git a/spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java b/akka-modules/spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java similarity index 100% rename from spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java rename to akka-modules/spring-akka/src/main/java/com/baeldung/akka/SpringExtension.java diff --git a/spring-akka/src/main/resources/logback.xml b/akka-modules/spring-akka/src/main/resources/logback.xml similarity index 100% rename from spring-akka/src/main/resources/logback.xml rename to akka-modules/spring-akka/src/main/resources/logback.xml diff --git a/spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java b/akka-modules/spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java similarity index 100% rename from spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java rename to akka-modules/spring-akka/src/test/java/com/baeldung/akka/SpringAkkaIntegrationTest.java diff --git a/pom.xml b/pom.xml index a486b0d17c..5ecd457f7b 100644 --- a/pom.xml +++ b/pom.xml @@ -330,8 +330,7 @@ parent-spring-5 parent-java - akka-http - akka-streams + akka-modules algorithms-modules annotations @@ -578,7 +577,6 @@ spring-5-webflux-2 spring-activiti - spring-akka spring-amqp spring-aop spring-aop-2 @@ -767,8 +765,7 @@ parent-spring-5 parent-java - akka-http - akka-streams + akka-modules algorithms-modules annotations @@ -1010,7 +1007,6 @@ spring-activiti - spring-akka spring-amqp spring-aop spring-aop-2 From 45d808ce562bac31140c88c53447ef616ee13f53 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:22:21 +0530 Subject: [PATCH 49/86] JAVA-12730: Rename java-collections-conversions to core-java-collections-conversions --- .../README.md | 0 .../pom.xml | 6 +++--- .../src/main/java/com/baeldung/convertToMap/Book.java | 0 .../main/java/com/baeldung/convertToMap/ConvertToMap.java | 0 .../java/com/baeldung/convertcollectiontoarraylist/Foo.java | 0 .../src/main/java/com/baeldung/convertlisttomap/Animal.java | 0 .../baeldung/convertlisttomap/ConvertListToMapService.java | 0 .../src/main/resources/logback.xml | 0 .../com/baeldung/convertToMap/ConvertToMapUnitTest.java | 0 .../CollectionToArrayListUnitTest.java | 0 .../ConvertIteratorToListServiceUnitTest.java | 0 .../convertlisttomap/ConvertListToMapServiceUnitTest.java | 0 .../ConvertListWithDuplicatedIdToMapServiceUnitTest.java | 0 .../java/collections/IterableToCollectionUnitTest.java | 0 .../java/collections/JavaCollectionConversionUnitTest.java | 0 .../java/com/baeldung/java/lists/ListToStringUnitTest.java | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/README.md (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/pom.xml (86%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/java/com/baeldung/convertToMap/Book.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/java/com/baeldung/convertToMap/ConvertToMap.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/java/com/baeldung/convertlisttomap/Animal.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/main/resources/logback.xml (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDuplicatedIdToMapServiceUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/java/collections/JavaCollectionConversionUnitTest.java (100%) rename core-java-modules/{java-collections-conversions => core-java-collections-conversions}/src/test/java/com/baeldung/java/lists/ListToStringUnitTest.java (100%) diff --git a/core-java-modules/java-collections-conversions/README.md b/core-java-modules/core-java-collections-conversions/README.md similarity index 100% rename from core-java-modules/java-collections-conversions/README.md rename to core-java-modules/core-java-collections-conversions/README.md diff --git a/core-java-modules/java-collections-conversions/pom.xml b/core-java-modules/core-java-collections-conversions/pom.xml similarity index 86% rename from core-java-modules/java-collections-conversions/pom.xml rename to core-java-modules/core-java-collections-conversions/pom.xml index 2751e0100a..08a452da51 100644 --- a/core-java-modules/java-collections-conversions/pom.xml +++ b/core-java-modules/core-java-collections-conversions/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-collections-conversions + core-java-collections-conversions 0.1.0-SNAPSHOT - java-collections-conversions + core-java-collections-conversions jar @@ -28,7 +28,7 @@ - java-collections-conversions + core-java-collections-conversions src/main/resources diff --git a/core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertToMap/Book.java b/core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertToMap/Book.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertToMap/Book.java rename to core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertToMap/Book.java diff --git a/core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java b/core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java rename to core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java diff --git a/core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java b/core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java rename to core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java diff --git a/core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/Animal.java b/core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/Animal.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/Animal.java rename to core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/Animal.java diff --git a/core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java b/core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java rename to core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertlisttomap/ConvertListToMapService.java diff --git a/core-java-modules/java-collections-conversions/src/main/resources/logback.xml b/core-java-modules/core-java-collections-conversions/src/main/resources/logback.xml similarity index 100% rename from core-java-modules/java-collections-conversions/src/main/resources/logback.xml rename to core-java-modules/core-java-collections-conversions/src/main/resources/logback.xml diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListToMapServiceUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDuplicatedIdToMapServiceUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDuplicatedIdToMapServiceUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDuplicatedIdToMapServiceUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertlisttomap/ConvertListWithDuplicatedIdToMapServiceUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/collections/JavaCollectionConversionUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/collections/JavaCollectionConversionUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/collections/JavaCollectionConversionUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/collections/JavaCollectionConversionUnitTest.java diff --git a/core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/lists/ListToStringUnitTest.java b/core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/lists/ListToStringUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions/src/test/java/com/baeldung/java/lists/ListToStringUnitTest.java rename to core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/java/lists/ListToStringUnitTest.java From 3502a350a49798bcda597acfbbb54430185572c2 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:22:56 +0530 Subject: [PATCH 50/86] JAVA-12730: Rename java-collections-conversions-2 to core-java-collections-conversions-2 --- .../README.md | 0 .../pom.xml | 6 +++--- .../com/baeldung/convertlisttomap/ListToMapConverter.java | 0 .../src/main/java/com/baeldung/modelmapper/MapperUtil.java | 0 .../src/main/java/com/baeldung/modelmapper/User.java | 0 .../src/main/java/com/baeldung/modelmapper/UserDTO.java | 0 .../src/main/java/com/baeldung/modelmapper/UserList.java | 0 .../src/main/java/com/baeldung/modelmapper/UserListDTO.java | 0 .../java/com/baeldung/modelmapper/UsersListConverter.java | 0 .../arrayconversion/ArrayToListConversionUnitTest.java | 0 .../convertarraytostring/ArrayToStringUnitTest.java | 0 .../com/baeldung/convertlisttomap/ListToMapUnitTest.java | 0 .../com/baeldung/modelmapper/UsersListMappingUnitTest.java | 0 .../test/java/com/baeldung/setiteration/SetIteration.java | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/README.md (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/pom.xml (88%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/convertlisttomap/ListToMapConverter.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/MapperUtil.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/User.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/UserDTO.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/UserList.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/UserListDTO.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/main/java/com/baeldung/modelmapper/UsersListConverter.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/test/java/com/baeldung/arrayconversion/ArrayToListConversionUnitTest.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/test/java/com/baeldung/convertarraytostring/ArrayToStringUnitTest.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/test/java/com/baeldung/convertlisttomap/ListToMapUnitTest.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/test/java/com/baeldung/modelmapper/UsersListMappingUnitTest.java (100%) rename core-java-modules/{java-collections-conversions-2 => core-java-collections-conversions-2}/src/test/java/com/baeldung/setiteration/SetIteration.java (100%) diff --git a/core-java-modules/java-collections-conversions-2/README.md b/core-java-modules/core-java-collections-conversions-2/README.md similarity index 100% rename from core-java-modules/java-collections-conversions-2/README.md rename to core-java-modules/core-java-collections-conversions-2/README.md diff --git a/core-java-modules/java-collections-conversions-2/pom.xml b/core-java-modules/core-java-collections-conversions-2/pom.xml similarity index 88% rename from core-java-modules/java-collections-conversions-2/pom.xml rename to core-java-modules/core-java-collections-conversions-2/pom.xml index 510921c35e..f6775a7a42 100644 --- a/core-java-modules/java-collections-conversions-2/pom.xml +++ b/core-java-modules/core-java-collections-conversions-2/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-collections-conversions-2 + core-java-collections-conversions-2 0.1.0-SNAPSHOT - java-collections-conversions-2 + core-java-collections-conversions-2 jar @@ -33,7 +33,7 @@ - java-collections-conversions-2 + core-java-collections-conversions-2 src/main/resources diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/convertlisttomap/ListToMapConverter.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/convertlisttomap/ListToMapConverter.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/convertlisttomap/ListToMapConverter.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/convertlisttomap/ListToMapConverter.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/MapperUtil.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/MapperUtil.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/MapperUtil.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/MapperUtil.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/User.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/User.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/User.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/User.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserDTO.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserDTO.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserDTO.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserDTO.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserListDTO.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserListDTO.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserListDTO.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserListDTO.java diff --git a/core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UsersListConverter.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UsersListConverter.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UsersListConverter.java rename to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UsersListConverter.java diff --git a/core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/arrayconversion/ArrayToListConversionUnitTest.java b/core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/arrayconversion/ArrayToListConversionUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/arrayconversion/ArrayToListConversionUnitTest.java rename to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/arrayconversion/ArrayToListConversionUnitTest.java diff --git a/core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/convertarraytostring/ArrayToStringUnitTest.java b/core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertarraytostring/ArrayToStringUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/convertarraytostring/ArrayToStringUnitTest.java rename to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertarraytostring/ArrayToStringUnitTest.java diff --git a/core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/convertlisttomap/ListToMapUnitTest.java b/core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertlisttomap/ListToMapUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/convertlisttomap/ListToMapUnitTest.java rename to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertlisttomap/ListToMapUnitTest.java diff --git a/core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/modelmapper/UsersListMappingUnitTest.java b/core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/modelmapper/UsersListMappingUnitTest.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/modelmapper/UsersListMappingUnitTest.java rename to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/modelmapper/UsersListMappingUnitTest.java diff --git a/core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/setiteration/SetIteration.java b/core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/setiteration/SetIteration.java similarity index 100% rename from core-java-modules/java-collections-conversions-2/src/test/java/com/baeldung/setiteration/SetIteration.java rename to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/setiteration/SetIteration.java From f776d6d4543836be73d8fd704bedf836f2777936 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:23:39 +0530 Subject: [PATCH 51/86] JAVA-12730: Rename java-numbers to core-java-numbers --- .../{java-numbers => core-java-numbers}/.gitignore | 0 .../{java-numbers => core-java-numbers}/README.md | 0 .../{java-numbers => core-java-numbers}/pom.xml | 6 +++--- .../src/main/java/com/baeldung/maths/BigDecimalDemo.java | 0 .../java/com/baeldung/maths/FloatingPointArithmetic.java | 0 .../src/main/java/com/baeldung/maths/Round.java | 0 .../com/baeldung/nth/root/calculator/NthRootCalculator.java | 0 .../src/main/java/com/baeldung/nth/root/main/Main.java | 0 .../main/java/com/baeldung/numberofdigits/Benchmarking.java | 0 .../java/com/baeldung/numberofdigits/NumberOfDigits.java | 0 .../com/baeldung/numberofdigits/NumberOfDigitsDriver.java | 0 .../java/com/baeldung/pairsaddupnumber/DifferentPairs.java | 0 .../java/com/baeldung/pairsaddupnumber/ExistingPairs.java | 0 .../main/java/com/baeldung/pairsaddupnumber/FindPairs.java | 0 .../src/main/java/com/baeldung/random/SecureRandomDemo.java | 0 .../src/main/java/com/baeldung/string/DoubleToString.java | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/logback.xml | 0 .../decimalformat/DecimalFormatExamplesUnitTest.java | 0 .../java/com/baeldung/maths/BigDecimalDemoUnitTest.java | 0 .../java/com/baeldung/maths/BigDecimalImplUnitTest.java | 0 .../java/com/baeldung/maths/BigIntegerDemoUnitTest.java | 0 .../java/com/baeldung/maths/BigIntegerImplUnitTest.java | 0 .../com/baeldung/maths/FloatingPointArithmeticUnitTest.java | 0 .../src/test/java/com/baeldung/maths/MathSinUnitTest.java | 0 .../src/test/java/com/baeldung/maths/RoundUnitTest.java | 0 .../nth/root/calculator/NthRootCalculatorUnitTest.java | 0 .../numberofdigits/NumberOfDigitsIntegrationTest.java | 0 .../baeldung/pairsaddupnumber/DifferentPairsUnitTest.java | 0 .../baeldung/pairsaddupnumber/ExistingPairsUnitTest.java | 0 .../test/java/com/baeldung/random/JavaRandomUnitTest.java | 0 .../removingdecimals/RemovingDecimalsManualTest.java | 0 .../baeldung/removingdecimals/RemovingDecimalsUnitTest.java | 0 .../java/com/baeldung/string/DoubleToStringUnitTest.java | 0 34 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-numbers => core-java-numbers}/.gitignore (100%) rename core-java-modules/{java-numbers => core-java-numbers}/README.md (100%) rename core-java-modules/{java-numbers => core-java-numbers}/pom.xml (91%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/maths/BigDecimalDemo.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/maths/Round.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/nth/root/main/Main.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/numberofdigits/Benchmarking.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/random/SecureRandomDemo.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/java/com/baeldung/string/DoubleToString.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/resources/log4j.properties (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/main/resources/logback.xml (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/MathSinUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/maths/RoundUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/random/JavaRandomUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java (100%) rename core-java-modules/{java-numbers => core-java-numbers}/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java (100%) diff --git a/core-java-modules/java-numbers/.gitignore b/core-java-modules/core-java-numbers/.gitignore similarity index 100% rename from core-java-modules/java-numbers/.gitignore rename to core-java-modules/core-java-numbers/.gitignore diff --git a/core-java-modules/java-numbers/README.md b/core-java-modules/core-java-numbers/README.md similarity index 100% rename from core-java-modules/java-numbers/README.md rename to core-java-modules/core-java-numbers/README.md diff --git a/core-java-modules/java-numbers/pom.xml b/core-java-modules/core-java-numbers/pom.xml similarity index 91% rename from core-java-modules/java-numbers/pom.xml rename to core-java-modules/core-java-numbers/pom.xml index 9bd0f33a85..4b2cae8ee9 100644 --- a/core-java-modules/java-numbers/pom.xml +++ b/core-java-modules/core-java-numbers/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-numbers + core-java-numbers 0.1.0-SNAPSHOT - java-numbers + core-java-numbers jar @@ -33,7 +33,7 @@ - java-numbers + core-java-numbers src/main/resources diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/Round.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/Round.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/string/DoubleToString.java similarity index 100% rename from core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/string/DoubleToString.java diff --git a/core-java-modules/java-numbers/src/main/resources/log4j.properties b/core-java-modules/core-java-numbers/src/main/resources/log4j.properties similarity index 100% rename from core-java-modules/java-numbers/src/main/resources/log4j.properties rename to core-java-modules/core-java-numbers/src/main/resources/log4j.properties diff --git a/core-java-modules/java-numbers/src/main/resources/logback.xml b/core-java-modules/core-java-numbers/src/main/resources/logback.xml similarity index 100% rename from core-java-modules/java-numbers/src/main/resources/logback.xml rename to core-java-modules/core-java-numbers/src/main/resources/logback.xml diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java similarity index 100% rename from core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java From da4c248bbdab8fffffc8c4f73ca160e8500a505c Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:24:10 +0530 Subject: [PATCH 52/86] JAVA-12730: Rename java-numbers-2 to core-java-numbers-2 --- .../{java-numbers-2 => core-java-numbers-2}/README.md | 0 .../{java-numbers-2 => core-java-numbers-2}/pom.xml | 6 +++--- .../algorithms/primechecker/BigIntegerPrimeChecker.java | 0 .../algorithms/primechecker/BruteForcePrimeChecker.java | 0 .../algorithms/primechecker/OptimisedPrimeChecker.java | 0 .../com/baeldung/algorithms/primechecker/PrimeChecker.java | 0 .../algorithms/primechecker/PrimesPrimeChecker.java | 0 .../src/main/java/com/baeldung/area/circle/Circle.java | 0 .../src/main/java/com/baeldung/area/circle/CircleArea.java | 0 .../main/java/com/baeldung/binarynumbers/BinaryNumbers.java | 0 .../src/main/java/com/baeldung/lcm/BigIntegerLCM.java | 0 .../src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java | 0 .../java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java | 0 .../src/main/java/com/baeldung/lcm/SimpleAlgorithm.java | 0 .../src/main/java/com/baeldung/nan/NaNExample.java | 0 .../src/main/java/com/baeldung/pow/PowerExample.java | 0 .../src/main/java/com/baeldung/prime/PrimeGenerator.java | 0 .../algorithms/primechecker/PrimeCheckerUnitTest.java | 0 .../com/baeldung/binarynumbers/BinaryNumbersUnitTest.java | 0 .../src/test/java/com/baeldung/java/math/MathUnitTest.java | 0 .../test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java | 0 .../java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java | 0 .../baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java | 0 .../test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java | 0 .../lossyconversion/ConversionTechniquesUnitTest.java | 0 .../java/com/baeldung/prime/PrimeGeneratorUnitTest.java | 0 26 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/README.md (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/pom.xml (89%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/area/circle/Circle.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/area/circle/CircleArea.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/lcm/BigIntegerLCM.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/nan/NaNExample.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/pow/PowerExample.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/main/java/com/baeldung/prime/PrimeGenerator.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/java/math/MathUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java (100%) rename core-java-modules/{java-numbers-2 => core-java-numbers-2}/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java (100%) diff --git a/core-java-modules/java-numbers-2/README.md b/core-java-modules/core-java-numbers-2/README.md similarity index 100% rename from core-java-modules/java-numbers-2/README.md rename to core-java-modules/core-java-numbers-2/README.md diff --git a/core-java-modules/java-numbers-2/pom.xml b/core-java-modules/core-java-numbers-2/pom.xml similarity index 89% rename from core-java-modules/java-numbers-2/pom.xml rename to core-java-modules/core-java-numbers-2/pom.xml index b41348e375..ac3843607e 100644 --- a/core-java-modules/java-numbers-2/pom.xml +++ b/core-java-modules/core-java-numbers-2/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-numbers-2 + core-java-numbers-2 0.1.0-SNAPSHOT - java-numbers-2 + core-java-numbers-2 jar @@ -28,7 +28,7 @@ - java-numbers-2 + core-java-numbers-2 src/main/resources diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java similarity index 100% rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java From d3c8b9cdcf5769c97f4da757472f4796c1128f73 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:24:35 +0530 Subject: [PATCH 53/86] JAVA-12730: Rename java-numbers-3 to core-java-numbers-3 --- .../{java-numbers-3 => core-java-numbers-3}/README.md | 0 .../{java-numbers-3 => core-java-numbers-3}/pom.xml | 6 +++--- .../java/com/baeldung/fibonacci/FibonacciSeriesUtils.java | 0 .../main/java/com/baeldung/formatNumber/FormatNumber.java | 0 .../java/com/baeldung/integerToBinary/IntegerToBinary.java | 0 .../java/com/baeldung/numbersinrange/NumbersInARange.java | 0 .../com/baeldung/numbersinrange/RandomNumbersInARange.java | 0 .../com/baeldung/randomnumbers/RandomNumbersGenerator.java | 0 .../com/baeldung/abstractnumber/AbstractNumberUnitTest.java | 0 .../com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java | 0 .../com/baeldung/doubletolong/DoubleToLongUnitTest.java | 0 .../baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java | 0 .../com/baeldung/formatNumber/FormatNumberUnitTest.java | 0 .../baeldung/integerToBinary/IntegerToBinaryUnitTest.java | 0 .../baeldung/numbersinrange/NumbersInARangeUnitTest.java | 0 .../numbersinrange/RandomNumbersInARangeUnitTest.java | 0 .../baeldung/parsedouble/StringToDoubleParserUnitTest.java | 0 .../randomnumbers/RandomNumbersGeneratorUnitTest.java | 0 18 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/README.md (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/pom.xml (90%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/formatNumber/FormatNumber.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java (100%) rename core-java-modules/{java-numbers-3 => core-java-numbers-3}/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java (100%) diff --git a/core-java-modules/java-numbers-3/README.md b/core-java-modules/core-java-numbers-3/README.md similarity index 100% rename from core-java-modules/java-numbers-3/README.md rename to core-java-modules/core-java-numbers-3/README.md diff --git a/core-java-modules/java-numbers-3/pom.xml b/core-java-modules/core-java-numbers-3/pom.xml similarity index 90% rename from core-java-modules/java-numbers-3/pom.xml rename to core-java-modules/core-java-numbers-3/pom.xml index 2c2006e303..8acdaa6be4 100644 --- a/core-java-modules/java-numbers-3/pom.xml +++ b/core-java-modules/core-java-numbers-3/pom.xml @@ -2,8 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-numbers-3 - java-numbers-3 + core-java-numbers-3 + core-java-numbers-3 jar @@ -32,7 +32,7 @@ - java-numbers-3 + core-java-numbers-3 src/main/resources diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java diff --git a/core-java-modules/java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java b/core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java similarity index 100% rename from core-java-modules/java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java rename to core-java-modules/core-java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java diff --git a/core-java-modules/java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java rename to core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java From 585717541c7849b949436257526a06cfba75aeb6 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:24:57 +0530 Subject: [PATCH 54/86] JAVA-12730: Rename java-numbers-4 to core-java-numbers-4 --- .../{java-numbers-4 => core-java-numbers-4}/README.md | 0 .../{java-numbers-4 => core-java-numbers-4}/pom.xml | 6 +++--- .../com/baeldung/automorphicnumber/AutomorphicNumber.java | 0 .../main/java/com/baeldung/booleantoint/BooleanToInt.java | 0 .../com/baeldung/convertLongToInt/ConvertLongToInt.java | 0 .../com/baeldung/humanreadablebytes/FileSizeFormatUtil.java | 0 .../src/main/java/com/baeldung/number_0xff/Number0xff.java | 0 .../java/com/baeldung/perfectsquare/PerfectSquareUtil.java | 0 .../java/com/baeldung/probability/MaleHeightGenerator.java | 0 .../main/java/com/baeldung/probability/RandomInvoker.java | 0 .../main/java/com/baeldung/reversenumber/ReverseNumber.java | 0 .../automorphicnumber/AutomorphicNumberUnitTest.java | 0 .../baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java | 0 .../java/com/baeldung/biginteger/BigIntegerUnitTest.java | 0 .../com/baeldung/booleantoint/BooleanToIntUnitTest.java | 0 .../baeldung/convertLongToInt/ConvertLongToIntUnitTest.java | 0 .../humanreadablebytes/FileSizeFormatUtilUnitTest.java | 0 .../java/com/baeldung/number_0xff/Number0xffUnitTest.java | 0 .../com/baeldung/perfectsquare/PerfectSquareUnitTest.java | 0 .../com/baeldung/probability/RandomInvokerUnitTest.java | 0 .../com/baeldung/reversenumber/ReverseNumberUnitTest.java | 0 21 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/README.md (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/pom.xml (90%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/booleantoint/BooleanToInt.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/number_0xff/Number0xff.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/probability/MaleHeightGenerator.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/probability/RandomInvoker.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/main/java/com/baeldung/reversenumber/ReverseNumber.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java (100%) rename core-java-modules/{java-numbers-4 => core-java-numbers-4}/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java (100%) diff --git a/core-java-modules/java-numbers-4/README.md b/core-java-modules/core-java-numbers-4/README.md similarity index 100% rename from core-java-modules/java-numbers-4/README.md rename to core-java-modules/core-java-numbers-4/README.md diff --git a/core-java-modules/java-numbers-4/pom.xml b/core-java-modules/core-java-numbers-4/pom.xml similarity index 90% rename from core-java-modules/java-numbers-4/pom.xml rename to core-java-modules/core-java-numbers-4/pom.xml index b3ecb3be42..4fe8b292da 100644 --- a/core-java-modules/java-numbers-4/pom.xml +++ b/core-java-modules/core-java-numbers-4/pom.xml @@ -2,8 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-numbers-4 - java-numbers-4 + core-java-numbers-4 + core-java-numbers-4 jar @@ -31,7 +31,7 @@ - java-numbers-4 + core-java-numbers-4 src/main/resources diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java diff --git a/core-java-modules/java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java b/core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java similarity index 100% rename from core-java-modules/java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java rename to core-java-modules/core-java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java diff --git a/core-java-modules/java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java b/core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java rename to core-java-modules/core-java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java From a1fbbd3c0c7889f40346aa2c1c925e0a667ff584 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:25:18 +0530 Subject: [PATCH 55/86] JAVA-12730: Rename java-numbers-5 to core-java-numbers-5 --- .../{java-numbers-5 => core-java-numbers-5}/README.md | 0 .../{java-numbers-5 => core-java-numbers-5}/pom.xml | 6 +++--- .../src/main/java/com/baeldung/evenodd/EvenOdd.java | 0 .../src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename core-java-modules/{java-numbers-5 => core-java-numbers-5}/README.md (100%) rename core-java-modules/{java-numbers-5 => core-java-numbers-5}/pom.xml (82%) rename core-java-modules/{java-numbers-5 => core-java-numbers-5}/src/main/java/com/baeldung/evenodd/EvenOdd.java (100%) rename core-java-modules/{java-numbers-5 => core-java-numbers-5}/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java (100%) diff --git a/core-java-modules/java-numbers-5/README.md b/core-java-modules/core-java-numbers-5/README.md similarity index 100% rename from core-java-modules/java-numbers-5/README.md rename to core-java-modules/core-java-numbers-5/README.md diff --git a/core-java-modules/java-numbers-5/pom.xml b/core-java-modules/core-java-numbers-5/pom.xml similarity index 82% rename from core-java-modules/java-numbers-5/pom.xml rename to core-java-modules/core-java-numbers-5/pom.xml index f5805981ae..f236d28ccb 100644 --- a/core-java-modules/java-numbers-5/pom.xml +++ b/core-java-modules/core-java-numbers-5/pom.xml @@ -2,8 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-numbers-5 - java-numbers-5 + core-java-numbers-5 + core-java-numbers-5 jar @@ -13,7 +13,7 @@ - java-numbers-5 + core-java-numbers-5 src/main/resources diff --git a/core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java b/core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java similarity index 100% rename from core-java-modules/java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java rename to core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java diff --git a/core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java b/core-java-modules/core-java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java similarity index 100% rename from core-java-modules/java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java rename to core-java-modules/core-java-numbers-5/src/test/java/com/baeldung/evenodd/EvenOddUnitTest.java From cba7eccc23bad2c3b008ebf86897b2f970dd8b5c Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:25:51 +0530 Subject: [PATCH 56/86] JAVA-12730: Rename java-collections-maps-3 to core-java-collections-maps-5 --- .../README.md | 0 .../pom.xml | 4 ++-- .../src/main/java/com/baeldung/map/bytearrays/BytesKey.java | 0 .../src/main/java/com/baeldung/map/entry/Book.java | 0 .../com/baeldung/map/entry/MapEntryEfficiencyExample.java | 0 .../java/com/baeldung/map/entry/MapEntryTupleExample.java | 0 .../src/main/java/com/baeldung/map/hashing/Member.java | 0 .../java/com/baeldung/map/hashing/MemberWithBadHashing.java | 0 .../java/com/baeldung/map/hashing/MemberWithGuavaHashing.java | 0 .../src/main/java/com/baeldung/map/hashing/MemberWithId.java | 0 .../java/com/baeldung/map/hashing/MemberWithIdAndName.java | 0 .../main/java/com/baeldung/map/hashing/MemberWithObjects.java | 0 .../baeldung/map/identity/IdentityHashMapDemonstrator.java | 0 .../java/com/baeldung/map/invert/InvertHashMapExample.java | 0 .../com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java | 0 .../map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java | 0 .../test/java/com/baeldung/map/entry/MapEntryUnitTest.java | 0 .../java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java | 0 .../test/java/com/baeldung/map/hashing/HashingUnitTest.java | 0 .../map/identity/IdentityHashMapDemonstratorUnitTest.java | 0 .../java/com/baeldung/map/invert/InvertHashMapUnitTest.java | 0 .../map/keysetValuesEntrySet/EntrySetExampleUnitTest.java | 0 .../map/keysetValuesEntrySet/KeySetExampleUnitTest.java | 0 .../map/keysetValuesEntrySet/ValuesExampleUnitTest.java | 0 24 files changed, 2 insertions(+), 2 deletions(-) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/README.md (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/pom.xml (92%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/bytearrays/BytesKey.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/entry/Book.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/Member.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/MemberWithId.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java (100%) rename core-java-modules/{java-collections-maps-3 => core-java-collections-maps-5}/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java (100%) diff --git a/core-java-modules/java-collections-maps-3/README.md b/core-java-modules/core-java-collections-maps-5/README.md similarity index 100% rename from core-java-modules/java-collections-maps-3/README.md rename to core-java-modules/core-java-collections-maps-5/README.md diff --git a/core-java-modules/java-collections-maps-3/pom.xml b/core-java-modules/core-java-collections-maps-5/pom.xml similarity index 92% rename from core-java-modules/java-collections-maps-3/pom.xml rename to core-java-modules/core-java-collections-maps-5/pom.xml index ab80a9e2fd..ba7083e42e 100644 --- a/core-java-modules/java-collections-maps-3/pom.xml +++ b/core-java-modules/core-java-collections-maps-5/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java-collections-maps-3 + core-java-collections-maps-5 0.1.0-SNAPSHOT - java-collections-maps-3 + core-java-collections-maps-5 jar diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/bytearrays/BytesKey.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/bytearrays/BytesKey.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/bytearrays/BytesKey.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/bytearrays/BytesKey.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/Book.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/Book.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/Book.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/Book.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/Member.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/Member.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/Member.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/Member.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithId.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithId.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithId.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithId.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java similarity index 100% rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java From 16f7224c44632a0f0948f9e16a5c4916ad4c8397 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:26:33 +0530 Subject: [PATCH 57/86] JAVA-12730: modify parent pom --- core-java-modules/pom.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index c2576d84f1..61a594c1a3 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -32,6 +32,8 @@ core-java-collections-3 core-java-collections-4 core-java-collections-array-list + core-java-collections-conversions + core-java-collections-conversions-2 core-java-collections-list core-java-collections-list-2 core-java-collections-list-3 @@ -39,6 +41,8 @@ core-java-collections-maps core-java-collections-maps-2 core-java-collections-maps-3 + core-java-collections-maps-4 + core-java-collections-maps-5 core-java-concurrency-2 core-java-concurrency-advanced core-java-concurrency-advanced-2 @@ -95,6 +99,11 @@ core-java-networking-2 core-java-nio core-java-nio-2 + core-java-numbers + core-java-numbers-2 + core-java-numbers-3 + core-java-numbers-4 + core-java-numbers-5 core-java-optional core-java-perf core-java-reflection @@ -119,15 +128,7 @@ core-java-regex core-java-regex-2 core-java-uuid - java-collections-conversions - java-collections-conversions-2 - java-collections-maps-3 - pre-jpms - java-numbers - java-numbers-2 - java-numbers-3 - java-numbers-4 - java-numbers-5 + pre-jpms From 90ba68c23343dd857592e881d66f07cf453507ed Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 26 Jun 2022 16:52:45 +0530 Subject: [PATCH 58/86] JAVA-12730: readme changes --- core-java-modules/core-java-collections-conversions-2/README.md | 2 +- core-java-modules/core-java-collections-conversions/README.md | 2 +- core-java-modules/core-java-collections-maps-5/README.md | 1 + core-java-modules/core-java-numbers-2/README.md | 2 +- core-java-modules/core-java-numbers-3/README.md | 2 +- core-java-modules/core-java-numbers-4/README.md | 2 +- core-java-modules/core-java-numbers/README.md | 2 +- core-java-modules/pom.xml | 1 - 8 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core-java-modules/core-java-collections-conversions-2/README.md b/core-java-modules/core-java-collections-conversions-2/README.md index 83b3ec8786..075f2b8736 100644 --- a/core-java-modules/core-java-collections-conversions-2/README.md +++ b/core-java-modules/core-java-collections-conversions-2/README.md @@ -9,4 +9,4 @@ This module contains articles about conversions among Collection types and array - [Converting List to Map With a Custom Supplier](https://www.baeldung.com/list-to-map-supplier) - [Arrays.asList vs new ArrayList(Arrays.asList())](https://www.baeldung.com/java-arrays-aslist-vs-new-arraylist) - [Iterate Over a Set in Java](https://www.baeldung.com/java-iterate-set) -- More articles: [[<-- prev]](../java-collections-conversions) +- More articles: [[<-- prev]](../core-java-collections-conversions) diff --git a/core-java-modules/core-java-collections-conversions/README.md b/core-java-modules/core-java-collections-conversions/README.md index 25a4d11b8b..98dda116d9 100644 --- a/core-java-modules/core-java-collections-conversions/README.md +++ b/core-java-modules/core-java-collections-conversions/README.md @@ -12,4 +12,4 @@ This module contains articles about conversions among Collection types and array - [Java 8 Collectors toMap](https://www.baeldung.com/java-collectors-tomap) - [Converting Iterable to Collection in Java](https://www.baeldung.com/java-iterable-to-collection) - [Converting Iterator to List](https://www.baeldung.com/java-convert-iterator-to-list) -- More articles: [[next -->]](../java-collections-conversions-2) \ No newline at end of file +- More articles: [[next -->]](../core-java-collections-conversions-2) \ No newline at end of file diff --git a/core-java-modules/core-java-collections-maps-5/README.md b/core-java-modules/core-java-collections-maps-5/README.md index e2e0a56489..24fb1b56d8 100644 --- a/core-java-modules/core-java-collections-maps-5/README.md +++ b/core-java-modules/core-java-collections-maps-5/README.md @@ -8,3 +8,4 @@ - [Java Map – keySet() vs. entrySet() vs. values() Methods](https://www.baeldung.com/java-map-entries-methods) - [Java IdentityHashMap Class and Its Use Cases](https://www.baeldung.com/java-identityhashmap) - [How to Invert a Map in Java](https://www.baeldung.com/java-invert-map) +- More articles: [[<-- prev]](../core-java-collections-maps-4) diff --git a/core-java-modules/core-java-numbers-2/README.md b/core-java-modules/core-java-numbers-2/README.md index 1a680183be..54f6cf30e8 100644 --- a/core-java-modules/core-java-numbers-2/README.md +++ b/core-java-modules/core-java-numbers-2/README.md @@ -13,4 +13,4 @@ This module contains articles about numbers in Java. - [Binary Numbers in Java](https://www.baeldung.com/java-binary-numbers) - [Finding the Least Common Multiple in Java](https://www.baeldung.com/java-least-common-multiple) - [Binary Numbers in Java](https://www.baeldung.com/java-binary-numbers) -- More articles: [[<-- prev]](../java-numbers) [[next -->]](../java-numbers-3) +- More articles: [[<-- prev]](../core-java-numbers) [[next -->]](../core-java-numbers-3) diff --git a/core-java-modules/core-java-numbers-3/README.md b/core-java-modules/core-java-numbers-3/README.md index c588b46d9b..fa2095131f 100644 --- a/core-java-modules/core-java-numbers-3/README.md +++ b/core-java-modules/core-java-numbers-3/README.md @@ -14,4 +14,4 @@ This module contains articles about numbers in Java. - [Print an Integer in Binary Format in Java](https://www.baeldung.com/java-print-integer-binary) - [Number Formatting in Java](https://www.baeldung.com/java-number-formatting) - [Division by Zero in Java: Exception, Infinity, or Not a Number](https://www.baeldung.com/java-division-by-zero) -- More articles: [[<-- prev]](../java-numbers-2) [[next -->]](../java-numbers-4) +- More articles: [[<-- prev]](../core-java-numbers-2) [[next -->]](../core-java-numbers-4) diff --git a/core-java-modules/core-java-numbers-4/README.md b/core-java-modules/core-java-numbers-4/README.md index 2a7578dbb0..697d791b82 100644 --- a/core-java-modules/core-java-numbers-4/README.md +++ b/core-java-modules/core-java-numbers-4/README.md @@ -10,4 +10,4 @@ - [Generate a Random Value From an Enum](https://www.baeldung.com/java-enum-random-value) - [Reverse a Number in Java](https://www.baeldung.com/java-reverse-number) - [Check if BigDecimal Value Is Zero](https://www.baeldung.com/java-bigdecimal-zero) -- More articles: [[<-- prev]](../java-numbers-3) \ No newline at end of file +- More articles: [[<-- prev]](../core-java-numbers-3) [[next -->]](../core-java-numbers-5) \ No newline at end of file diff --git a/core-java-modules/core-java-numbers/README.md b/core-java-modules/core-java-numbers/README.md index 772d09869e..f84959b994 100644 --- a/core-java-modules/core-java-numbers/README.md +++ b/core-java-modules/core-java-numbers/README.md @@ -13,4 +13,4 @@ This module contains articles about numbers in Java. - [Convert Double to String, Removing Decimal Places](https://www.baeldung.com/java-double-to-string) - [Changing the Order in a Sum Operation Can Produce Different Results?](https://www.baeldung.com/java-floating-point-sum-order) - [Using Math.sin with Degrees](https://www.baeldung.com/java-math-sin-degrees) -- More articles: [[next -->]](../java-numbers-2) +- More articles: [[next -->]](../core-java-numbers-2) diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 61a594c1a3..e44c508ce2 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -41,7 +41,6 @@ core-java-collections-maps core-java-collections-maps-2 core-java-collections-maps-3 - core-java-collections-maps-4 core-java-collections-maps-5 core-java-concurrency-2 core-java-concurrency-advanced From 77c668f3403ec65798a0483132f26e2aca8566df Mon Sep 17 00:00:00 2001 From: freelansam <79205526+freelansam@users.noreply.github.com> Date: Sun, 26 Jun 2022 21:12:01 +0530 Subject: [PATCH 59/86] JAVA-12465: Look into spring-cloud-rest module (#12406) * JAVA-12465: Look into spring-cloud-rest module * JAVA-12465: updated README to include ebook reference --- spring-cloud-modules/pom.xml | 3 +- .../spring-cloud-bootstrap/README.md | 4 +- .../spring-cloud-rest/.gitignore | 24 --- .../spring-cloud-rest/README.md | 5 - .../application-config/discovery.properties | 16 -- .../application-config/resource.properties | 20 --- .../spring-cloud-rest/pom.xml | 52 ------ .../spring-cloud-rest-books-api/pom.xml | 78 --------- .../com/baeldung/BooksApiApplication.java | 14 -- .../main/java/com/baeldung/SessionConfig.java | 8 - .../persistence/dao/BookRepository.java | 13 -- .../com/baeldung/persistence/model/Book.java | 111 ------------- .../src/main/resources/bootstrap.properties | 9 - .../src/main/resources/logback.xml | 13 -- .../com/baeldung/BooksApiIntegrationTest.java | 43 ----- .../java/com/baeldung/RestApiLiveTest.java | 156 ------------------ .../java/com/baeldung/SessionLiveTest.java | 70 -------- .../com/baeldung/SpringContextLiveTest.java | 22 --- .../src/test/resources/application.properties | 19 --- .../.gitignore | 24 --- .../spring-cloud-rest-config-server/pom.xml | 58 ------- .../SpringCloudRestConfigApplication.java | 17 -- .../src/main/resources/application.properties | 11 -- .../src/main/resources/logback.xml | 13 -- .../java/com/baeldung/SpringContextTest.java | 15 -- .../.gitignore | 24 --- .../pom.xml | 66 -------- .../main/java/com/baeldung/SessionConfig.java | 8 - .../SpringCloudRestServerApplication.java | 14 -- .../src/main/resources/bootstrap.properties | 4 - .../src/main/resources/logback.xml | 13 -- .../SpringCloudRestServerIntegrationTest.java | 42 ----- .../com/baeldung/SpringContextLiveTest.java | 21 --- .../spring-cloud-rest-reviews-api/pom.xml | 88 ---------- .../baeldung/BookReviewsApiApplication.java | 14 -- .../main/java/com/baeldung/SessionConfig.java | 8 - .../persistence/dao/BookReviewRepository.java | 13 -- .../persistence/model/BookReview.java | 120 -------------- .../src/main/resources/bootstrap.properties | 9 - .../src/main/resources/logback.xml | 13 -- .../BookReviewsApiIntegrationTest.java | 43 ----- .../java/com/baeldung/RestApiLiveTest.java | 147 ----------------- .../com/baeldung/SpringContextLiveTest.java | 22 --- .../src/test/resources/application.properties | 19 --- 44 files changed, 3 insertions(+), 1503 deletions(-) delete mode 100644 spring-cloud-modules/spring-cloud-rest/.gitignore delete mode 100644 spring-cloud-modules/spring-cloud-rest/README.md delete mode 100644 spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/application-config/resource.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/pom.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java delete mode 100644 spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml index e725b366c6..77c45eb640 100644 --- a/spring-cloud-modules/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -22,8 +22,7 @@ spring-cloud-eureka spring-cloud-hystrix spring-cloud-bootstrap - spring-cloud-ribbon-client - spring-cloud-rest + spring-cloud-ribbon-client spring-cloud-zookeeper spring-cloud-gateway spring-cloud-stream diff --git a/spring-cloud-modules/spring-cloud-bootstrap/README.md b/spring-cloud-modules/spring-cloud-bootstrap/README.md index 6923e951ff..252058be1f 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap/README.md +++ b/spring-cloud-modules/spring-cloud-bootstrap/README.md @@ -1,6 +1,6 @@ -## Spring Cloud Bootstrap +## Guide to Microservices: with Spring Boot and Spring Cloud Ebook -This module contains articles about bootstrapping Spring Cloud applications +This module contains articles about bootstrapping Spring Cloud applications that are part of the Guide to Microservices: with Spring Boot and Spring Cloud Ebook. ### Relevant Articles: diff --git a/spring-cloud-modules/spring-cloud-rest/.gitignore b/spring-cloud-modules/spring-cloud-rest/.gitignore deleted file mode 100644 index 2af7cefb0a..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/README.md b/spring-cloud-modules/spring-cloud-rest/README.md deleted file mode 100644 index 25d62007b6..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Spring Cloud REST - -This module contains articles about RESTful APIs with Spring Cloud - -Code for an ebook - "A REST API with Spring Boot and Spring Cloud" diff --git a/spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties deleted file mode 100644 index 2f2a56248f..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties +++ /dev/null @@ -1,16 +0,0 @@ -spring.application.name=discovery -server.port=8761 - -#### cloud -eureka.instance.hostname=localhost -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} -eureka.client.registerWithEureka=false -eureka.client.fetchRegistry=false - -#### security -security.basic.enabled=true -security.basic.path=/** -security.user.name=system -security.user.password=systemPass -security.user.role=ADMIN -security.sessions=always \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/application-config/resource.properties b/spring-cloud-modules/spring-cloud-rest/application-config/resource.properties deleted file mode 100644 index 759bb87895..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/application-config/resource.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.application.name=resource -#server.port=0 - -#### cloud -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} -eureka.instance.preferIpAddress=true - -#### persistence -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:cloud_rest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password= - -#### security -security.basic.enabled=true -security.basic.path=/** -security.user.name=user -security.user.password=userPass -security.user.role=USER -security.sessions=always \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/pom.xml b/spring-cloud-modules/spring-cloud-rest/pom.xml deleted file mode 100644 index 0b3cda772a..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-rest - 1.0.0-SNAPSHOT - spring-cloud-rest - pom - - - com.baeldung.spring.cloud - spring-cloud-modules - 1.0.0-SNAPSHOT - - - - spring-cloud-rest-config-server - spring-cloud-rest-discovery-server - spring-cloud-rest-books-api - spring-cloud-rest-reviews-api - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - - - - - 1.4.2.RELEASE - 1.8 - 1.8 - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml deleted file mode 100644 index c7ff472655..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-rest-books-api - 0.0.1-SNAPSHOT - spring-cloud-rest-books-api - jar - Simple books API - - - com.baeldung - parent-boot-1 - 0.0.1-SNAPSHOT - ../../../parent-boot-1 - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR4 - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java deleted file mode 100644 index abcbabe737..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; - -@SpringBootApplication -@EnableEurekaClient -public class BooksApiApplication { - - public static void main(String[] args) { - SpringApplication.run(BooksApiApplication.class, args); - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java deleted file mode 100644 index 6c984fb6d5..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung; - -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer; - -@EnableRedisHttpSession -public class SessionConfig extends AbstractHttpSessionApplicationInitializer { -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java deleted file mode 100644 index 434d4332f7..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.model.Book; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.query.Param; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -@RepositoryRestResource(collectionResourceRel = "books", path = "books") -public interface BookRepository extends CrudRepository { - Page findByTitle(@Param("title") String title, Pageable pageable); -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java deleted file mode 100644 index 26fe3625ec..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.baeldung.persistence.model; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -@Entity -public class Book { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private long id; - - @Column(nullable = false, unique = true) - private String title; - - @Column(nullable = false) - private String author; - - // - - public Book() { - super(); - } - - public Book(String title, String author) { - super(); - this.title = title; - this.author = author; - } - - // - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author; - } - - // - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = (prime * result) + ((author == null) ? 0 : author.hashCode()); - result = (prime * result) + (int) (id ^ (id >>> 32)); - result = (prime * result) + ((title == null) ? 0 : title.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Book other = (Book) obj; - if (author == null) { - if (other.author != null) { - return false; - } - } else if (!author.equals(other.author)) { - return false; - } - if (id != other.id) { - return false; - } - - if (title == null) { - if (other.title != null) { - return false; - } - } else if (!title.equals(other.title)) { - return false; - } - return true; - } - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("Book [id=").append(id).append(", title=").append(title).append(", author=").append(author).append("]"); - return builder.toString(); - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties deleted file mode 100644 index 2cb3b71ca7..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,9 +0,0 @@ -spring.cloud.config.name=resource -spring.cloud.config.discovery.service-id=config -spring.cloud.config.discovery.enabled=true -spring.cloud.config.username=configUser -spring.cloud.config.password=configPassword - -eureka.client.serviceUrl.defaultZone=http://system:systemPass@localhost:8761/eureka - -server.port=8084 \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java deleted file mode 100644 index 2a90b668cb..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class BooksApiIntegrationTest { - - @Test - public void contextLoads() { - } - - @EnableRedisHttpSession - @Configuration - static class Config { - - @Bean - @SuppressWarnings("unchecked") - public RedisSerializer defaultRedisSerializer() { - return Mockito.mock(RedisSerializer.class); - } - - @Bean - public RedisConnectionFactory connectionFactory() { - - RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class); - RedisConnection connection = Mockito.mock(RedisConnection.class); - Mockito.when(factory.getConnection()).thenReturn(connection); - - return factory; - } - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java deleted file mode 100644 index 4184b3aef7..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.baeldung; - -import static io.restassured.RestAssured.preemptive; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import com.baeldung.BooksApiApplication; -import io.restassured.RestAssured; -import io.restassured.response.Response; - -import com.baeldung.persistence.model.Book; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = { BooksApiApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) -public class RestApiLiveTest { - - private static final String API_URI = "http://localhost:8084/books"; - - @Before - public void setUp() { - RestAssured.authentication = preemptive().basic("user", "userPass"); - } - - // GET - - @Test - public void whenGetAllBooks_thenOK() { - final Response response = RestAssured.get(API_URI); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - } - - @Test - public void whenGetCreatedBookById_thenOK() { - final Book book = createRandomBook(); - final String location = createBookAsUri(book); - - final Response response = RestAssured.get(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertEquals(book.getTitle(), response.jsonPath().get("title")); - } - - @Test - public void whenGetCreatedBookByName_thenOK() { - final Book book = createRandomBook(); - createBookAsUri(book); - - final Response response = RestAssured.get(API_URI + "/search/findByTitle?title=" + book.getTitle()); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertTrue(response.jsonPath().getLong("page.totalElements") > 0); - } - - @Test - public void whenGetNotExistBookById_thenNotFound() { - final Response response = RestAssured.get(API_URI + "/" + randomNumeric(4)); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - @Test - public void whenGetNotExistBookByName_thenNotFound() { - final Response response = RestAssured.get(API_URI + "/search/findByTitle?title=" + randomAlphabetic(20)); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertTrue(response.jsonPath().getLong("page.totalElements") == 0); - } - - // POST - @Test - public void whenCreateNewBook_thenCreated() { - final Book book = createRandomBook(); - - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(book).post(API_URI); - assertEquals(HttpStatus.CREATED.value(), response.getStatusCode()); - } - - @Test - public void whenCreateDuplicateBook_thenError() { - final Book book = createRandomBook(); - createBookAsUri(book); - - // duplicate - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(book).post(API_URI); - assertEquals(HttpStatus.CONFLICT.value(), response.getStatusCode()); - } - - @Test - public void whenInvalidBook_thenError() { - final Book book = createRandomBook(); - book.setAuthor(null); - - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(book).post(API_URI); - assertEquals(HttpStatus.CONFLICT.value(), response.getStatusCode()); - } - - @Test - public void whenUpdateCreatedBook_thenUpdated() { - // create - final Book book = createRandomBook(); - final String location = createBookAsUri(book); - - // update - book.setAuthor("newAuthor"); - Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(book).put(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - - // check if changes saved - response = RestAssured.get(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertEquals("newAuthor", response.jsonPath().get("author")); - - } - - @Test - public void whenDeleteCreatedBook_thenOk() { - // create - final Book book = createRandomBook(); - final String location = createBookAsUri(book); - - // delete - Response response = RestAssured.delete(location); - assertEquals(HttpStatus.NO_CONTENT.value(), response.getStatusCode()); - - // confirm it was deleted - response = RestAssured.get(location); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - @Test - public void whenDeleteNotExistBook_thenError() { - final Response response = RestAssured.delete(API_URI + "/" + randomNumeric(4)); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - // =============================== Util - - private Book createRandomBook() { - final Book book = new Book(); - book.setTitle(randomAlphabetic(10)); - book.setAuthor(randomAlphabetic(15)); - return book; - } - - private String createBookAsUri(Book book) { - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(book).post(API_URI); - return response.jsonPath().get("_links.self.href"); - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java deleted file mode 100644 index 9869a650b4..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.baeldung; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import com.baeldung.BooksApiApplication; -import com.baeldung.SessionConfig; -import io.restassured.RestAssured; -import io.restassured.response.Response; - -import java.util.Set; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.http.HttpStatus; -import org.springframework.test.context.junit4.SpringRunner; - -import redis.clients.jedis.Jedis; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = { BooksApiApplication.class, SessionConfig.class }, webEnvironment = WebEnvironment.DEFINED_PORT) -public class SessionLiveTest { - - private Jedis jedis; - private static final String API_URI = "http://localhost:8084/books"; - - @Before - public void setUp() { - jedis = new Jedis("localhost", 6379); - jedis.flushAll(); - } - - @Test - public void whenStart_thenNoSessionsExist() { - final Set result = jedis.keys("*"); - assertEquals(0, result.size()); - } - - @Test - public void givenUnauthorizeUser_whenAccessResources_then_unAuthorized() { - final Response response = RestAssured.get(API_URI); - assertEquals(HttpStatus.UNAUTHORIZED.value(), response.getStatusCode()); - } - - @Test - public void givenAuthorizedUser_whenDeleteSession_thenUnauthorized() { - // authorize User - Response response = RestAssured.given().auth().preemptive().basic("user", "userPass").get(API_URI); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - final String sessionCookie = response.getCookie("SESSION"); - - // check redis - final Set redisResult = jedis.keys("*"); - assertTrue(redisResult.size() > 0); - - // login with cookie - response = RestAssured.given().cookie("SESSION", sessionCookie).get(API_URI); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - - // empty redis - jedis.flushAll(); - - // login with cookie again - response = RestAssured.given().cookie("SESSION", sessionCookie).get(API_URI); - assertEquals(HttpStatus.UNAUTHORIZED.value(), response.getStatusCode()); - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java deleted file mode 100644 index 783c2f99c0..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baeldung; - -import com.baeldung.BooksApiApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * - * This Live Test requires: - * * A Redis instance running in port 6379 (e.g. using `docker run --name some-redis -p 6379:6379 -d redis`) - * - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = BooksApiApplication.class) -public class SpringContextLiveTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties deleted file mode 100644 index ece9ca1d94..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -#### cloud -spring.application.name=spring-cloud-eureka-client -server.port=8084 -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} -eureka.instance.preferIpAddress=true - -#### persistence -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:cloud_rest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password= - -#### security -security.basic.enabled=true -security.basic.path=/** -security.user.name=user -security.user.password=userPass -security.user.role=USER -security.sessions=always \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore deleted file mode 100644 index 2af7cefb0a..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml deleted file mode 100644 index 9180283c2d..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-rest-config-server - 0.0.1-SNAPSHOT - spring-cloud-rest-config-server - jar - Spring Cloud REST configuration server - - - com.baeldung - parent-boot-1 - 0.0.1-SNAPSHOT - ../../../parent-boot-1 - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-config-server - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-security - - - - - Camden.SR4 - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java deleted file mode 100644 index d49a21f4ed..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.config.server.EnableConfigServer; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; - -@SpringBootApplication -@EnableConfigServer -@EnableEurekaClient -public class SpringCloudRestConfigApplication { - - public static void main(String[] args) { - SpringApplication.run(SpringCloudRestConfigApplication.class, args); - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties deleted file mode 100644 index 4071dc81ea..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties +++ /dev/null @@ -1,11 +0,0 @@ -server.port=8081 -spring.application.name=config - -spring.cloud.config.server.git.uri=${HOME}/application-config - -eureka.client.region = default -eureka.client.registryFetchIntervalSeconds = 5 -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} - -security.user.name=configUser -security.user.password=configPassword \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java deleted file mode 100644 index 1548d6a95e..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudRestConfigApplication.class) -public class SpringContextTest { - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore deleted file mode 100644 index 2af7cefb0a..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml deleted file mode 100644 index eb65395821..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-rest-discovery-server - 0.0.1-SNAPSHOT - spring-cloud-rest-discovery-server - jar - Spring Cloud REST server - - - com.baeldung - parent-boot-1 - 0.0.1-SNAPSHOT - ../../../parent-boot-1 - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka-server - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - Edgware.SR4 - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java deleted file mode 100644 index 6c984fb6d5..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung; - -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer; - -@EnableRedisHttpSession -public class SessionConfig extends AbstractHttpSessionApplicationInitializer { -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java deleted file mode 100644 index 1cc0f2982c..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; - -@SpringBootApplication -@EnableEurekaServer -public class SpringCloudRestServerApplication { - - public static void main(String[] args) { - SpringApplication.run(SpringCloudRestServerApplication.class, args); - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties deleted file mode 100644 index d31caf55b5..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,4 +0,0 @@ -spring.cloud.config.name=discovery -spring.cloud.config.uri=http://localhost:8081 -spring.cloud.config.username=configUser -spring.cloud.config.password=configPassword \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java deleted file mode 100644 index 1ee895b6b1..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringCloudRestServerIntegrationTest { - @Test - public void contextLoads() { - } - - @EnableRedisHttpSession - @Configuration - static class Config { - - @Bean - @SuppressWarnings("unchecked") - public RedisSerializer defaultRedisSerializer() { - return Mockito.mock(RedisSerializer.class); - } - - @Bean - public RedisConnectionFactory connectionFactory() { - - RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class); - RedisConnection connection = Mockito.mock(RedisConnection.class); - Mockito.when(factory.getConnection()).thenReturn(connection); - - return factory; - } - } -} \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java deleted file mode 100644 index 92acd482cd..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * - * This Live Test requires: - * * A Redis instance running in port 6379 (e.g. using `docker run --name some-redis -p 6379:6379 -d redis`) - * - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudRestServerApplication.class) -public class SpringContextLiveTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml deleted file mode 100644 index a8d5837320..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-rest-reviews-api - 0.0.1-SNAPSHOT - spring-cloud-rest-reviews-api - jar - Simple reviews API - - - com.baeldung - parent-boot-1 - 0.0.1-SNAPSHOT - ../../../parent-boot-1 - - - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR4 - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - com.github.kstyrc - embedded-redis - ${embedded-redis.version} - - - - - 3.0.1 - 0.6 - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java deleted file mode 100644 index 707c97cb69..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; - -@SpringBootApplication -@EnableEurekaClient -public class BookReviewsApiApplication { - - public static void main(String[] args) { - SpringApplication.run(BookReviewsApiApplication.class, args); - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java deleted file mode 100644 index 6c984fb6d5..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung; - -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer; - -@EnableRedisHttpSession -public class SessionConfig extends AbstractHttpSessionApplicationInitializer { -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java deleted file mode 100644 index 1f29b66867..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.model.BookReview; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.query.Param; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -@RepositoryRestResource(collectionResourceRel = "reviews", path = "reviews") -public interface BookReviewRepository extends CrudRepository { - Page findByBookId(@Param("bookId") long bookId, Pageable pageable); -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java deleted file mode 100644 index 4b6ff7f32b..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.baeldung.persistence.model; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -@Entity -public class BookReview { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private long id; - - private String content; - - private int rating; - - @Column(nullable = false) - private Long bookId; - - // - - public BookReview() { - super(); - } - - public BookReview(String content, int rating, long bookId) { - super(); - this.content = content; - this.rating = rating; - this.bookId = bookId; - } - - // - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public int getRating() { - return rating; - } - - public void setRating(int rating) { - this.rating = rating; - } - - public Long getBookId() { - return bookId; - } - - public void setBookId(Long bookId) { - this.bookId = bookId; - } - - // - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = (prime * result) + (int) (bookId ^ (bookId >>> 32)); - result = (prime * result) + ((content == null) ? 0 : content.hashCode()); - result = (prime * result) + (int) (id ^ (id >>> 32)); - result = (prime * result) + rating; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final BookReview other = (BookReview) obj; - if (bookId != other.bookId) { - return false; - } - if (content == null) { - if (other.content != null) { - return false; - } - } else if (!content.equals(other.content)) { - return false; - } - if (id != other.id) { - return false; - } - if (rating != other.rating) { - return false; - } - return true; - } - - // - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("BookReview [id=").append(id).append(", content=").append(content).append(", rating=").append(rating).append(", bookId=").append(bookId).append("]"); - return builder.toString(); - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties deleted file mode 100644 index d6e642afcb..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,9 +0,0 @@ -spring.cloud.config.name=resource -spring.cloud.config.discovery.service-id=config -spring.cloud.config.discovery.enabled=true -spring.cloud.config.username=configUser -spring.cloud.config.password=configPassword - -eureka.client.serviceUrl.defaultZone=http://system:systemPass@localhost:8761/eureka - -server.port=8085 \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java deleted file mode 100644 index 7d7867f9ac..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class BookReviewsApiIntegrationTest { - - @Test - public void contextLoads() { - } - - @EnableRedisHttpSession - @Configuration - static class Config { - - @Bean - @SuppressWarnings("unchecked") - public RedisSerializer defaultRedisSerializer() { - return Mockito.mock(RedisSerializer.class); - } - - @Bean - public RedisConnectionFactory connectionFactory() { - - RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class); - RedisConnection connection = Mockito.mock(RedisConnection.class); - Mockito.when(factory.getConnection()).thenReturn(connection); - - return factory; - } - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java deleted file mode 100644 index 88f845adcc..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.baeldung; - -import static io.restassured.RestAssured.preemptive; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import com.baeldung.BookReviewsApiApplication; -import io.restassured.RestAssured; -import io.restassured.response.Response; - -import com.baeldung.persistence.model.BookReview; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = { BookReviewsApiApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) -public class RestApiLiveTest { - - private static final String API_URI = "http://localhost:8085/reviews"; - - @Before - public void setUp() { - RestAssured.authentication = preemptive().basic("user", "userPass"); - } - - // GET - - @Test - public void whenGetAllReviews_thenOK() { - final Response response = RestAssured.get(API_URI); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - } - - @Test - public void whenGetCreatedReviewById_thenOK() { - final BookReview review = createRandomReview(); - final String location = createReviewAsUri(review); - - final Response response = RestAssured.get(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertEquals(review.getContent(), response.jsonPath().get("content")); - } - - @Test - public void whenGetCreatedReviewByBookId_thenOK() { - final BookReview review = createRandomReview(); - createReviewAsUri(review); - - final Response response = RestAssured.get(API_URI + "/search/findByBookId?bookId=" + review.getBookId()); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertTrue(response.jsonPath().getLong("page.totalElements") > 0); - } - - @Test - public void whenGetNotExistReviewById_thenNotFound() { - final Response response = RestAssured.get(API_URI + "/" + randomNumeric(4)); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - @Test - public void whenGetNotExistReviewByBookId_thenNotFound() { - final Response response = RestAssured.get(API_URI + "/search/findByBookId?bookId=" + randomNumeric(4)); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertTrue(response.jsonPath().getLong("page.totalElements") == 0); - } - - // POST - @Test - public void whenCreateNewReview_thenCreated() { - final BookReview review = createRandomReview(); - - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(review).post(API_URI); - assertEquals(HttpStatus.CREATED.value(), response.getStatusCode()); - } - - @Test - public void whenCreateInvalidReview_thenError() { - final BookReview review = createRandomReview(); - review.setBookId(null); - - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(review).post(API_URI); - assertEquals(HttpStatus.CONFLICT.value(), response.getStatusCode()); - } - - @Test - public void whenUpdateCreatedReview_thenUpdated() { - // create - final BookReview review = createRandomReview(); - final String location = createReviewAsUri(review); - - // update - review.setRating(4); - Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(review).put(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - - // check if changes saved - response = RestAssured.get(location); - assertEquals(HttpStatus.OK.value(), response.getStatusCode()); - assertEquals(4, response.jsonPath().getInt("rating")); - - } - - @Test - public void whenDeleteCreatedReview_thenOk() { - // create - final BookReview review = createRandomReview(); - final String location = createReviewAsUri(review); - - // delete - Response response = RestAssured.delete(location); - assertEquals(HttpStatus.NO_CONTENT.value(), response.getStatusCode()); - - // confirm it was deleted - response = RestAssured.get(location); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - @Test - public void whenDeleteNotExistReview_thenError() { - final Response response = RestAssured.delete(API_URI + "/" + randomNumeric(4)); - assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatusCode()); - } - - // =============================== Util - - private BookReview createRandomReview() { - final BookReview review = new BookReview(); - review.setContent(randomAlphabetic(10)); - review.setRating(3); - review.setBookId(1L); - return review; - } - - private String createReviewAsUri(BookReview review) { - final Response response = RestAssured.given().contentType(MediaType.APPLICATION_JSON_VALUE).body(review).post(API_URI); - return response.jsonPath().get("_links.self.href"); - } - -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java deleted file mode 100644 index 6bb75ed1eb..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baeldung; - -import com.baeldung.BookReviewsApiApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * - * This Live Test requires: - * * A Redis instance running in port 6379 (e.g. using `docker run --name some-redis -p 6379:6379 -d redis`) - * - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = BookReviewsApiApplication.class) -public class SpringContextLiveTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties deleted file mode 100644 index e69cb2f555..0000000000 --- a/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -#### cloud -spring.application.name=spring-cloud-eureka-client -server.port=8085 -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} -eureka.instance.preferIpAddress=true - -#### persistence -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:cloud_rest;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.username=sa -spring.datasource.password= - -#### security -security.basic.enabled=true -security.basic.path=/** -security.user.name=user -security.user.password=userPass -security.user.role=USER -security.sessions=always \ No newline at end of file From 5dec45e2815d47c2d9c467cbe63cdf70ec42f3e2 Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Sun, 26 Jun 2022 16:45:33 +0100 Subject: [PATCH 60/86] Java 11501 (#12409) * added parent module (akka-modules) * moved akka-http(submodule) to akka-modules(parent) * moved akka-streams(submodule) to akka-modules(parent) * moved spring-akka(submodule) to akka-modules(parent) * deleted submodules that we moved to akka-modules * removed version Co-authored-by: panagiotiskakos --- akka-modules/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/akka-modules/pom.xml b/akka-modules/pom.xml index bb182b38bb..490da5b7a8 100644 --- a/akka-modules/pom.xml +++ b/akka-modules/pom.xml @@ -4,7 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 akka-modules - 1.0.0-SNAPSHOT akka-modules pom From 3624a450ed72058cbf70401e70fb705656dbb59c Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Sun, 26 Jun 2022 16:46:19 +0100 Subject: [PATCH 61/86] Java 11497 (#12410) * Added/created parent module (json-modules) * moved json(submodule) to json-modules(parent) * moved json-2(submodule) to json-modules(parent) * moved json-path(submodule) to json-modules(parent) * moved gson(submodule) to json-modules(parent) * deleted sub-modules that we moved to json-modules * removed version Co-authored-by: panagiotiskakos --- json-modules/json-2/README.md | 2 ++ json-modules/pom.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/json-modules/json-2/README.md b/json-modules/json-2/README.md index 65bc6d5bd9..8087927ad3 100644 --- a/json-modules/json-2/README.md +++ b/json-modules/json-2/README.md @@ -10,4 +10,6 @@ This module contains articles about JSON. - [Generate a Java Class From JSON](https://www.baeldung.com/java-generate-class-from-json) - [A Guide to FastJson](https://www.baeldung.com/fastjson) - [Check Whether a String is Valid JSON in Java](https://www.baeldung.com/java-validate-json-string) + - More Articles: [[<-- prev]](/json-modules/json) + diff --git a/json-modules/pom.xml b/json-modules/pom.xml index 6d18738a51..171086db2e 100644 --- a/json-modules/pom.xml +++ b/json-modules/pom.xml @@ -4,7 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 json-modules - 1.0.0-SNAPSHOT json-modules pom From 413ee370c2bfd37f30430771d00c94efc4c2857b Mon Sep 17 00:00:00 2001 From: Avin Buricha Date: Sun, 26 Jun 2022 21:58:47 +0530 Subject: [PATCH 62/86] BAEL-5368 Guide to Find in MongoDB (#12361) * BAEL-5368 | Article code * BAEL-5368 | Package renamed --- persistence-modules/java-mongodb-3/.gitignore | 5 + persistence-modules/java-mongodb-3/pom.xml | 28 ++++++ .../baeldung/mongo/find/FindOperation.java | 86 +++++++++++++++++ .../src/main/resources/logback.xml | 13 +++ .../mongo/find/FindOperationLiveTest.java | 94 +++++++++++++++++++ .../src/test/resources/employee.json | 3 + persistence-modules/pom.xml | 1 + 7 files changed, 230 insertions(+) create mode 100644 persistence-modules/java-mongodb-3/.gitignore create mode 100644 persistence-modules/java-mongodb-3/pom.xml create mode 100644 persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/find/FindOperation.java create mode 100644 persistence-modules/java-mongodb-3/src/main/resources/logback.xml create mode 100644 persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/find/FindOperationLiveTest.java create mode 100644 persistence-modules/java-mongodb-3/src/test/resources/employee.json diff --git a/persistence-modules/java-mongodb-3/.gitignore b/persistence-modules/java-mongodb-3/.gitignore new file mode 100644 index 0000000000..79ba317cb5 --- /dev/null +++ b/persistence-modules/java-mongodb-3/.gitignore @@ -0,0 +1,5 @@ +.classpath +.project +.settings +target +build \ No newline at end of file diff --git a/persistence-modules/java-mongodb-3/pom.xml b/persistence-modules/java-mongodb-3/pom.xml new file mode 100644 index 0000000000..6b02172491 --- /dev/null +++ b/persistence-modules/java-mongodb-3/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + java-mongodb-3 + 1.0-SNAPSHOT + java-mongodb-3 + + + com.baeldung + persistence-modules + 1.0.0-SNAPSHOT + + + + + org.mongodb + mongo-java-driver + ${mongo.version} + + + + + 3.12.1 + + + diff --git a/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/find/FindOperation.java b/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/find/FindOperation.java new file mode 100644 index 0000000000..6000684deb --- /dev/null +++ b/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/find/FindOperation.java @@ -0,0 +1,86 @@ +package com.baeldung.mongo.find; + +import com.mongodb.MongoClient; +import com.mongodb.client.FindIterable; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoCursor; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; +import org.bson.conversions.Bson; + +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Projections.fields; +import static com.mongodb.client.model.Projections.include; + +public class FindOperation { + + private static MongoClient mongoClient; + private static MongoDatabase database; + private static MongoCollection collection; + private static String collectionName; + private static String databaseName; + + public static void setUp() { + if (mongoClient == null) { + mongoClient = new MongoClient("localhost", 27017); + + databaseName = "baeldung"; + collectionName = "employee"; + + database = mongoClient.getDatabase(databaseName); + collection = database.getCollection(collectionName); + } + } + + public static void retrieveAllDocumentsUsingFind() { + FindIterable documents = collection.find(); + + MongoCursor cursor = documents.iterator(); + while (cursor.hasNext()) { + System.out.println(cursor.next()); + } + } + + public static void retrieveAllDocumentsUsingFindWithQueryFilter() { + Bson filter = eq("department", "Engineering"); + FindIterable documents = collection.find(filter); + + MongoCursor cursor = documents.iterator(); + while (cursor.hasNext()) { + System.out.println(cursor.next()); + } + } + + public static void retrieveAllDocumentsUsingFindWithQueryFilterAndProjection() { + Bson filter = eq("department", "Engineering"); + Bson projection = fields(include("name", "age")); + FindIterable documents = collection.find(filter) + .projection(projection); + + MongoCursor cursor = documents.iterator(); + while (cursor.hasNext()) { + System.out.println(cursor.next()); + } + } + + public static void retrieveFirstDocument() { + FindIterable documents = collection.find(); + Document document = documents.first(); + + System.out.println(document); + } + + public static void main(String args[]) { + + setUp(); + + retrieveAllDocumentsUsingFind(); + + retrieveAllDocumentsUsingFindWithQueryFilter(); + + retrieveAllDocumentsUsingFindWithQueryFilterAndProjection(); + + retrieveFirstDocument(); + } +} + diff --git a/persistence-modules/java-mongodb-3/src/main/resources/logback.xml b/persistence-modules/java-mongodb-3/src/main/resources/logback.xml new file mode 100644 index 0000000000..7d900d8ea8 --- /dev/null +++ b/persistence-modules/java-mongodb-3/src/main/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/find/FindOperationLiveTest.java b/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/find/FindOperationLiveTest.java new file mode 100644 index 0000000000..21a263381d --- /dev/null +++ b/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/find/FindOperationLiveTest.java @@ -0,0 +1,94 @@ +package com.baeldung.mongo.find; + +import com.mongodb.MongoClient; +import com.mongodb.client.FindIterable; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoCursor; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; +import org.bson.conversions.Bson; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Projections.fields; +import static com.mongodb.client.model.Projections.include; +import static org.junit.Assert.*; + +public class FindOperationLiveTest { + + private static MongoClient mongoClient; + private static MongoDatabase database; + private static MongoCollection collection; + private static final String DATASET_JSON = "/employee.json"; + + @BeforeClass + public static void setUp() throws IOException { + if (mongoClient == null) { + mongoClient = new MongoClient("localhost", 27017); + + database = mongoClient.getDatabase("baeldung"); + collection = database.getCollection("employee"); + + collection.drop(); + + InputStream is = FindOperationLiveTest.class.getResourceAsStream(DATASET_JSON); + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + reader.lines() + .forEach(line -> collection.insertOne(Document.parse(line))); + reader.close(); + } + } + + @Test + public void givenEmployeeCollection_whenFetchingUsingFindOperations_thenCheckingForDocuments() { + FindIterable documents = collection.find(); + MongoCursor cursor = documents.iterator(); + + assertNotNull(cursor); + assertTrue(cursor.hasNext()); + } + + @Test + public void givenEmployeeCollection_whenFetchingUsingFindOperationsWithFilters_thenCheckingForDocuments() { + Bson filter = eq("department", "Engineering"); + FindIterable documents = collection.find(filter); + MongoCursor cursor = documents.iterator(); + + assertNotNull(cursor); + assertTrue(cursor.hasNext()); + } + + @Test + public void givenEmployeeCollection_whenFetchingUsingFindOperationsWithFiltersAndProjection_thenCheckingForDocuments() { + Bson filter = eq("department", "Engineering"); + Bson projection = fields(include("name", "age")); + FindIterable documents = collection.find(filter) + .projection(projection); + MongoCursor cursor = documents.iterator(); + + assertNotNull(cursor); + assertTrue(cursor.hasNext()); + } + + @Test + public void givenEmployeeCollection_whenFetchingFirstDocumentUsingFindOperations_thenCheckingForDocument() { + Document employee = collection.find() + .first(); + + assertNotNull(employee); + assertFalse(employee.isEmpty()); + } + + @AfterClass + public static void cleanUp() { + mongoClient.close(); + } +} + diff --git a/persistence-modules/java-mongodb-3/src/test/resources/employee.json b/persistence-modules/java-mongodb-3/src/test/resources/employee.json new file mode 100644 index 0000000000..bcc7814c3b --- /dev/null +++ b/persistence-modules/java-mongodb-3/src/test/resources/employee.json @@ -0,0 +1,3 @@ +{"employeeId":"EMP1","name":"Sam","age":23,"type":"Full Time","department":"Engineering"} +{"employeeId":"EMP2","name":"Tony","age":31,"type":"Full Time","department":"Admin"} +{"employeeId":"EMP3","name":"Lisa","age":42,"type":"Part Time","department":"Engineering"} \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 4637ab7ecc..4bab0631bd 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -44,6 +44,7 @@ java-jpa-3 java-mongodb java-mongodb-2 + java-mongodb-3 jnosql jooq jpa-hibernate-cascade-type From e798355a92c79d63004a783b46214bcd070003a5 Mon Sep 17 00:00:00 2001 From: Ulisses Lima Date: Sun, 26 Jun 2022 13:32:33 -0300 Subject: [PATCH 63/86] BAEL-5394 - Unique Field in MongoDB Document in Spring Data (#12384) * BAEL-5370 - MongoDB Composite Key First Draft. * removing comments * BAEL-5370 Test could fail if ran in a different order: givenCompositeId_whenSearchingByIdObject_thenFound * BAEL-5370 removing compound index related stuff * removing first insert from assertThrows * first draft * removing Customer2 --- .../SpringBootUniqueFieldApplication.java | 15 +++ .../unique/field/dao/AssetRepository.java | 8 ++ .../unique/field/dao/CompanyRepository.java | 11 ++ .../unique/field/dao/CustomerRepository.java | 11 ++ .../boot/unique/field/dao/SaleRepository.java | 12 ++ .../boot/unique/field/data/Asset.java | 29 +++++ .../boot/unique/field/data/Company.java | 40 +++++++ .../boot/unique/field/data/Customer.java | 57 +++++++++ .../baeldung/boot/unique/field/data/Sale.java | 36 ++++++ .../boot/unique/field/data/SaleId.java | 22 ++++ .../field/web/UniqueFieldController.java | 83 +++++++++++++ .../boot.unique.field/app.properties | 1 + .../field/UniqueFieldIntegrationTest.java | 112 ++++++++++++++++++ 13 files changed, 437 insertions(+) create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/SpringBootUniqueFieldApplication.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/AssetRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CompanyRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CustomerRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/SaleRepository.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Asset.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Company.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Customer.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Sale.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/SaleId.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/web/UniqueFieldController.java create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.unique.field/app.properties create mode 100644 persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/unique/field/UniqueFieldIntegrationTest.java diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/SpringBootUniqueFieldApplication.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/SpringBootUniqueFieldApplication.java new file mode 100644 index 0000000000..648ecd4dfb --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/SpringBootUniqueFieldApplication.java @@ -0,0 +1,15 @@ +package com.baeldung.boot.unique.field; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.PropertySource; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; + +@SpringBootApplication +@PropertySource("classpath:boot.unique.field/app.properties") +@EnableMongoRepositories(basePackages = { "com.baeldung.boot.unique.field" }) +public class SpringBootUniqueFieldApplication { + public static void main(String... args) { + SpringApplication.run(SpringBootUniqueFieldApplication.class, args); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/AssetRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/AssetRepository.java new file mode 100644 index 0000000000..9adca8b4bd --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/AssetRepository.java @@ -0,0 +1,8 @@ +package com.baeldung.boot.unique.field.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.unique.field.data.Asset; + +public interface AssetRepository extends MongoRepository { +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CompanyRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CompanyRepository.java new file mode 100644 index 0000000000..718e284efe --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CompanyRepository.java @@ -0,0 +1,11 @@ +package com.baeldung.boot.unique.field.dao; + +import java.util.Optional; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.unique.field.data.Company; + +public interface CompanyRepository extends MongoRepository { + Optional findByEmail(String email); +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CustomerRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CustomerRepository.java new file mode 100644 index 0000000000..f6e5b54470 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/CustomerRepository.java @@ -0,0 +1,11 @@ +package com.baeldung.boot.unique.field.dao; + +import java.util.Optional; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.unique.field.data.Customer; + +public interface CustomerRepository extends MongoRepository { + Optional findByStoreIdAndNumber(Long storeId, Long number); +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/SaleRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/SaleRepository.java new file mode 100644 index 0000000000..8547a5ab76 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/dao/SaleRepository.java @@ -0,0 +1,12 @@ +package com.baeldung.boot.unique.field.dao; + +import java.util.Optional; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.unique.field.data.Sale; +import com.baeldung.boot.unique.field.data.SaleId; + +public interface SaleRepository extends MongoRepository { + Optional findBySaleId(SaleId id); +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Asset.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Asset.java new file mode 100644 index 0000000000..9652691a8b --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Asset.java @@ -0,0 +1,29 @@ +package com.baeldung.boot.unique.field.data; + +import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Asset { + @Indexed(unique = true) + private String name; + + @Indexed(unique = true) + private Integer number; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Company.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Company.java new file mode 100644 index 0000000000..31b4cf0588 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Company.java @@ -0,0 +1,40 @@ +package com.baeldung.boot.unique.field.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Company { + @Id + private String id; + + private String name; + + @Indexed(unique = true) + private String email; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Customer.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Customer.java new file mode 100644 index 0000000000..d1459dc663 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Customer.java @@ -0,0 +1,57 @@ +package com.baeldung.boot.unique.field.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.CompoundIndex; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +@CompoundIndex(name = "customer_idx", def = "{ 'storeId': 1, 'number': 1 }", unique = true) +public class Customer { + @Id + private String id; + + private Long storeId; + + private Long number; + + private String name; + + public Customer() { + } + + public Customer(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Long getStoreId() { + return storeId; + } + + public void setStoreId(Long storeId) { + this.storeId = storeId; + } + + public Long getNumber() { + return number; + } + + public void setNumber(Long number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Sale.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Sale.java new file mode 100644 index 0000000000..3d0a549575 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/Sale.java @@ -0,0 +1,36 @@ +package com.baeldung.boot.unique.field.data; + +import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Sale { + @Indexed(unique = true) + private SaleId saleId; + + private Double value; + + public Sale() { + } + + public Sale(SaleId saleId) { + super(); + this.saleId = saleId; + } + + public SaleId getSaleId() { + return saleId; + } + + public void setSaleId(SaleId saleId) { + this.saleId = saleId; + } + + public Double getValue() { + return value; + } + + public void setValue(Double value) { + this.value = value; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/SaleId.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/SaleId.java new file mode 100644 index 0000000000..69a5c5a561 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/data/SaleId.java @@ -0,0 +1,22 @@ +package com.baeldung.boot.unique.field.data; + +public class SaleId { + private Long item; + private String date; + + public Long getItem() { + return item; + } + + public void setItem(Long item) { + this.item = item; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } +} \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/web/UniqueFieldController.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/web/UniqueFieldController.java new file mode 100644 index 0000000000..716977edd4 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/unique/field/web/UniqueFieldController.java @@ -0,0 +1,83 @@ +package com.baeldung.boot.unique.field.web; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.boot.unique.field.dao.AssetRepository; +import com.baeldung.boot.unique.field.dao.CompanyRepository; +import com.baeldung.boot.unique.field.dao.CustomerRepository; +import com.baeldung.boot.unique.field.dao.SaleRepository; +import com.baeldung.boot.unique.field.data.Asset; +import com.baeldung.boot.unique.field.data.Company; +import com.baeldung.boot.unique.field.data.Customer; +import com.baeldung.boot.unique.field.data.Sale; +import com.baeldung.boot.unique.field.data.SaleId; + +@RestController +@RequestMapping("/unique-field") +public class UniqueFieldController { + @Autowired + private SaleRepository saleRepo; + + @Autowired + private CompanyRepository companyRepo; + + @Autowired + private CustomerRepository customerRepo; + + @Autowired + private AssetRepository assetRepo; + + @PostMapping("/sale") + public Sale post(@RequestBody Sale sale) { + return saleRepo.insert(sale); + } + + @GetMapping("/sale") + public Optional getSale(SaleId id) { + return saleRepo.findBySaleId(id); + } + + @PostMapping("/company") + public Company post(@RequestBody Company company) { + return companyRepo.insert(company); + } + + @PutMapping("/company") + public Company put(@RequestBody Company company) { + return companyRepo.save(company); + } + + @GetMapping("/company/{id}") + public Optional getCompany(@PathVariable String id) { + return companyRepo.findById(id); + } + + @PostMapping("/customer") + public Customer post(@RequestBody Customer customer) { + return customerRepo.insert(customer); + } + + @GetMapping("/customer/{id}") + public Optional getCustomer(@PathVariable String id) { + return customerRepo.findById(id); + } + + @PostMapping("/asset") + public Asset post(@RequestBody Asset asset) { + return assetRepo.insert(asset); + } + + @GetMapping("/asset/{id}") + public Optional getAsset(@PathVariable String id) { + return assetRepo.findById(id); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.unique.field/app.properties b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.unique.field/app.properties new file mode 100644 index 0000000000..a73a94d850 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/resources/boot.unique.field/app.properties @@ -0,0 +1 @@ +spring.data.mongodb.auto-index-creation=true diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/unique/field/UniqueFieldIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/unique/field/UniqueFieldIntegrationTest.java new file mode 100644 index 0000000000..c18a877b79 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/unique/field/UniqueFieldIntegrationTest.java @@ -0,0 +1,112 @@ +package com.baeldung.boot.unique.field; + +import static org.junit.Assert.assertThrows; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +import com.baeldung.boot.unique.field.dao.AssetRepository; +import com.baeldung.boot.unique.field.dao.CompanyRepository; +import com.baeldung.boot.unique.field.dao.CustomerRepository; +import com.baeldung.boot.unique.field.dao.SaleRepository; +import com.baeldung.boot.unique.field.data.Asset; +import com.baeldung.boot.unique.field.data.Company; +import com.baeldung.boot.unique.field.data.Customer; +import com.baeldung.boot.unique.field.data.Sale; +import com.baeldung.boot.unique.field.data.SaleId; + +@SpringBootTest +@DirtiesContext +@RunWith(SpringRunner.class) +public class UniqueFieldIntegrationTest { + @Autowired + private SaleRepository saleRepo; + + @Autowired + private CompanyRepository companyRepo; + + @Autowired + private CustomerRepository customerRepo; + + @Autowired + private AssetRepository assetRepo; + + @Test + public void givenMultipleIndexes_whenAnyFieldDupe_thenExceptionIsThrown() { + Asset a = new Asset(); + a.setName("Name"); + a.setNumber(1); + + assetRepo.insert(a); + + Asset b = new Asset(); + b.setName("Name"); + b.setNumber(2); + assertThrows(DuplicateKeyException.class, () -> { + assetRepo.insert(b); + }); + + Asset c = new Asset(); + c.setName("Other"); + c.setNumber(1); + assertThrows(DuplicateKeyException.class, () -> { + assetRepo.insert(c); + }); + } + + @Test + public void givenUniqueIndex_whenInsertingDupe_thenExceptionIsThrown() { + Company a = new Company(); + a.setName("Name"); + a.setEmail("a@mail.com"); + + companyRepo.insert(a); + + Company b = new Company(); + b.setName("Other"); + b.setEmail("a@mail.com"); + assertThrows(DuplicateKeyException.class, () -> { + companyRepo.insert(b); + }); + } + + @Test + public void givenCompoundIndex_whenDupeInsert_thenExceptionIsThrown() { + Customer customerA = new Customer("Name A"); + customerA.setNumber(1l); + customerA.setStoreId(2l); + + Customer customerB = new Customer("Name B"); + customerB.setNumber(1l); + customerB.setStoreId(2l); + + customerRepo.insert(customerA); + + assertThrows(DuplicateKeyException.class, () -> { + customerRepo.insert(customerB); + }); + } + + @Test + public void givenCustomTypeIndex_whenInsertingDupe_thenExceptionIsThrown() { + SaleId id = new SaleId(); + id.setDate("2022-06-15"); + id.setItem(1L); + + Sale a = new Sale(id); + a.setValue(53.94); + + saleRepo.insert(a); + + Sale b = new Sale(id); + b.setValue(100.00); + assertThrows(DuplicateKeyException.class, () -> { + saleRepo.insert(b); + }); + } +} From ff3cc7b948e831d0757141adc62f4594dd3a3527 Mon Sep 17 00:00:00 2001 From: etrandafir93 <75391049+etrandafir93@users.noreply.github.com> Date: Sun, 26 Jun 2022 18:33:25 +0200 Subject: [PATCH 64/86] BAEL-5439: PersistentObjectException: detached entity passed to persist thrown by JPA and Hibernate (#12303) * BAEL-5439: added code samples for article * BAEL-5439: added static import for assertj --- .../detachedentity/HibernateUtil.java | 46 ++++++++ .../detachedentity/entity/Comment.java | 56 +++++++++ .../exception/detachedentity/entity/Post.java | 44 ++++++++ .../DetachedEntityUnitTest.java | 106 ++++++++++++++++++ 4 files changed, 252 insertions(+) create mode 100644 persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/HibernateUtil.java create mode 100644 persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java create mode 100644 persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java create mode 100644 persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/HibernateUtil.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/HibernateUtil.java new file mode 100644 index 0000000000..0420755354 --- /dev/null +++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/HibernateUtil.java @@ -0,0 +1,46 @@ +package com.baeldung.hibernate.exception.detachedentity; + +import java.util.Properties; + +import org.hibernate.SessionFactory; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.service.ServiceRegistry; + +import com.baeldung.hibernate.exception.detachedentity.entity.Comment; +import com.baeldung.hibernate.exception.detachedentity.entity.Post; + +public class HibernateUtil { + private static SessionFactory sessionFactory; + + public static SessionFactory getSessionFactory() { + if (sessionFactory == null) { + try { + Configuration configuration = new Configuration(); + Properties settings = new Properties(); + settings.put(Environment.DRIVER, "org.hsqldb.jdbcDriver"); + settings.put(Environment.URL, "jdbc:hsqldb:mem:transient"); + settings.put(Environment.USER, "sa"); + settings.put(Environment.PASS, ""); + settings.put(Environment.DIALECT, "org.hibernate.dialect.HSQLDialect"); + settings.put(Environment.SHOW_SQL, "true"); + settings.put(Environment.FORMAT_SQL, "true"); + settings.put(Environment.USE_SQL_COMMENTS, "true"); + settings.put(Environment.HBM2DDL_AUTO, "update"); + configuration.setProperties(settings); + + configuration.addAnnotatedClass(Comment.class); + configuration.addAnnotatedClass(Post.class); + + ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()) + .build(); + sessionFactory = configuration.buildSessionFactory(serviceRegistry); + + } catch (Exception e) { + e.printStackTrace(); + } + } + return sessionFactory; + } +} \ No newline at end of file diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java new file mode 100644 index 0000000000..4a3e9739e2 --- /dev/null +++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java @@ -0,0 +1,56 @@ +package com.baeldung.hibernate.exception.detachedentity.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Comment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String text; + + public Comment(String text) { + this.text = text; + } + + public Comment() { + } + + @ManyToOne + private Post post; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public Post getPost() { + return post; + } + + public void setPost(Post post) { + this.post = post; + } + + @Override + public String toString() { + return "Comment{" + "id=" + id + ", name='" + text + '\'' + ", post=" + post + '}'; + } +} diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java new file mode 100644 index 0000000000..7d95b41948 --- /dev/null +++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java @@ -0,0 +1,44 @@ +package com.baeldung.hibernate.exception.detachedentity.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Post { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String title; + + public Post() { + } + + public Post(String title) { + this.title = title; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + @Override + public String toString() { + return "Post{" + "id=" + id + ", text='" + title + '\'' + '}'; + } +} diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java new file mode 100644 index 0000000000..afb0efae77 --- /dev/null +++ b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java @@ -0,0 +1,106 @@ +package com.baeldung.hibernate.exception.detachedentity; + +import com.baeldung.hibernate.exception.detachedentity.entity.Comment; +import com.baeldung.hibernate.exception.detachedentity.entity.Post; + +import org.assertj.core.api.Assertions; +import org.hibernate.Session; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import javax.persistence.PersistenceException; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class DetachedEntityUnitTest { + + private static Session session; + private Post detachedPost; + + @Before + public void beforeEach() { + session = HibernateUtil.getSessionFactory() + .openSession(); + session.beginTransaction(); + this.detachedPost = new Post("Hibernate Tutorial"); + session.persist(detachedPost); + session.evict(detachedPost); + } + + @After + public void afterEach() { + clearDatabase(); + session.close(); + } + + @Test + public void givenDetachedPost_whenTryingToPersist_thenThrowException() { + detachedPost.setTitle("Hibernate Tutorial for Absolute Beginners"); + + assertThatThrownBy(() -> session.persist(detachedPost)) + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("org.hibernate.PersistentObjectException: detached entity passed to persist"); + } + + @Test + public void givenDetachedPost_whenTryingToMerge_thenNoExceptionIsThrown() { + detachedPost.setTitle("Hibernate Tutorial for Beginners"); + + session.merge(detachedPost); + session.getTransaction() + .commit(); + + List posts = session.createQuery("Select p from Post p", Post.class) + .list(); + assertThat(posts).hasSize(1); + assertThat(posts.get(0) + .getTitle()).isEqualTo("Hibernate Tutorial for Beginners"); + } + + @Test + public void givenDetachedPost_whenPersistingNewCommentWithIt_thenThrowException() { + Comment comment = new Comment("nice article!"); + comment.setPost(detachedPost); + + session.persist(comment); + session.getTransaction() + .commit(); + + assertThatThrownBy(() -> session.persist(detachedPost)) + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("org.hibernate.PersistentObjectException: detached entity passed to persist"); + } + + @Test + public void givenDetachedPost_whenMergeAndPersistComment_thenNoExceptionIsThrown() { + Comment comment = new Comment("nice article!"); + Post mergedPost = (Post) session.merge(detachedPost); + comment.setPost(mergedPost); + + session.persist(comment); + session.getTransaction() + .commit(); + + List comments = session.createQuery("Select c from Comment c", Comment.class) + .list(); + Comment savedComment = comments.get(0); + assertThat(savedComment.getText()).isEqualTo("nice article!"); + assertThat(savedComment.getPost() + .getTitle()).isEqualTo("Hibernate Tutorial"); + } + + private void clearDatabase() { + if (!session.getTransaction() + .isActive()) { + session.beginTransaction(); + } + session.createQuery("DELETE FROM Comment") + .executeUpdate(); + session.createQuery("DELETE FROM Post") + .executeUpdate(); + } +} From 676535b04d7be8f27217c460fa12bcecbcf1de8b Mon Sep 17 00:00:00 2001 From: psevestre Date: Sun, 26 Jun 2022 19:06:04 -0300 Subject: [PATCH 65/86] [BAEL-5258] Processing the Response Body in Spring Cloud Gateway (#12414) * [BAEL-4849] Article code * [BAEL-4968] Article code * [BAEL-4968] Article code * [BAEL-4968] Article code * [BAEL-4968] Remove extra comments * [BAEL-5258] Article Code --- .../ScrubResponseGatewayFilterFactory.java | 110 ++++++++++++++ .../global/LoggingGlobalFilterProperties.java | 47 ++++++ .../src/main/resources/application-scrub.yml | 12 ++ ...bResponseGatewayFilterFactoryUnitTest.java | 61 ++++++++ .../ScrubResponseGatewayFilterLiveTest.java | 135 ++++++++++++++++++ 5 files changed, 365 insertions(+) create mode 100644 spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactory.java create mode 100644 spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFilterProperties.java create mode 100644 spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-scrub.yml create mode 100644 spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactoryUnitTest.java create mode 100644 spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactory.java new file mode 100644 index 0000000000..dbe9a9fb4f --- /dev/null +++ b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactory.java @@ -0,0 +1,110 @@ +package com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories; + +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; + +import org.reactivestreams.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.gateway.filter.GatewayFilter; +import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.cloud.gateway.filter.factory.rewrite.ModifyResponseBodyGatewayFilterFactory; +import org.springframework.cloud.gateway.filter.factory.rewrite.RewriteFunction; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; + +import com.fasterxml.jackson.core.TreeNode; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; + +import reactor.core.publisher.Mono; + +@Component +public class ScrubResponseGatewayFilterFactory extends AbstractGatewayFilterFactory { + + final Logger logger = LoggerFactory.getLogger(ScrubResponseGatewayFilterFactory.class); + private ModifyResponseBodyGatewayFilterFactory modifyResponseBodyFilterFactory; + + public ScrubResponseGatewayFilterFactory(ModifyResponseBodyGatewayFilterFactory modifyResponseBodyFilterFactory) { + super(Config.class); + this.modifyResponseBodyFilterFactory = modifyResponseBodyFilterFactory; + } + + @Override + public List shortcutFieldOrder() { + return Arrays.asList("fields", "replacement"); + } + + + @Override + public GatewayFilter apply(Config config) { + + return modifyResponseBodyFilterFactory + .apply(c -> c.setRewriteFunction(JsonNode.class, JsonNode.class, new Scrubber(config))); + } + + public static class Config { + + private String fields; + private String replacement; + + + public String getFields() { + return fields; + } + public void setFields(String fields) { + this.fields = fields; + } + public String getReplacement() { + return replacement; + } + public void setReplacement(String replacement) { + this.replacement = replacement; + } + } + + + public static class Scrubber implements RewriteFunction { + private final Pattern fields; + private final String replacement; + + public Scrubber(Config config) { + this.fields = Pattern.compile(config.getFields()); + this.replacement = config.getReplacement(); + } + + @Override + public Publisher apply(ServerWebExchange t, JsonNode u) { + return Mono.just(scrubRecursively(u)); + } + + private JsonNode scrubRecursively(JsonNode u) { + if ( !u.isContainerNode()) { + return u; + } + + if ( u.isObject()) { + ObjectNode node = (ObjectNode)u; + node.fields().forEachRemaining((f) -> { + if ( fields.matcher(f.getKey()).matches() && f.getValue().isTextual()) { + f.setValue(TextNode.valueOf(replacement)); + } + else { + f.setValue(scrubRecursively(f.getValue())); + } + }); + } + else if ( u.isArray()) { + ArrayNode array = (ArrayNode)u; + for ( int i = 0 ; i < array.size() ; i++ ) { + array.set(i, scrubRecursively(array.get(i))); + } + } + + return u; + } + } +} diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFilterProperties.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFilterProperties.java new file mode 100644 index 0000000000..4bf6453355 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFilterProperties.java @@ -0,0 +1,47 @@ +package com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.global; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("logging.global") +public class LoggingGlobalFilterProperties { + + private boolean enabled; + private boolean requestHeaders; + private boolean requestBody; + private boolean responseHeaders; + private boolean responseBody; + + public boolean isEnabled() { + return enabled; + } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public boolean isRequestHeaders() { + return requestHeaders; + } + public void setRequestHeaders(boolean requestHeaders) { + this.requestHeaders = requestHeaders; + } + public boolean isRequestBody() { + return requestBody; + } + public void setRequestBody(boolean requestBody) { + this.requestBody = requestBody; + } + public boolean isResponseHeaders() { + return responseHeaders; + } + public void setResponseHeaders(boolean responseHeaders) { + this.responseHeaders = responseHeaders; + } + public boolean isResponseBody() { + return responseBody; + } + public void setResponseBody(boolean responseBody) { + this.responseBody = responseBody; + } + + + +} diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-scrub.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-scrub.yml new file mode 100644 index 0000000000..da7dfea0a7 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-scrub.yml @@ -0,0 +1,12 @@ +spring: + cloud: + gateway: + routes: + - id: rewrite_with_scrub + uri: ${rewrite.backend.uri:http://example.com} + predicates: + - Path=/v1/customer/** + filters: + - RewritePath=/v1/customer/(?.*),/api/$\{segment} + - ScrubResponse=ssn,*** + \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactoryUnitTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactoryUnitTest.java new file mode 100644 index 0000000000..667aabaddc --- /dev/null +++ b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterFactoryUnitTest.java @@ -0,0 +1,61 @@ +package com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +import com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories.ScrubResponseGatewayFilterFactory.Config; +import com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories.ScrubResponseGatewayFilterFactory.Scrubber; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.core.TreeNode; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import reactor.core.publisher.Mono; + +class ScrubResponseGatewayFilterFactoryUnitTest { + + private static final String JSON_WITH_FIELDS_TO_SCRUB = "{\r\n" + + " \"name\" : \"John Doe\",\r\n" + + " \"ssn\" : \"123-45-9999\",\r\n" + + " \"account\" : \"9999888877770000\"\r\n" + + "}"; + + + @Test + void givenJsonWithFieldsToScrub_whenApply_thenScrubFields() throws Exception{ + + JsonFactory jf = new JsonFactory(new ObjectMapper()); + JsonParser parser = jf.createParser(JSON_WITH_FIELDS_TO_SCRUB); + JsonNode root = parser.readValueAsTree(); + + Config config = new Config(); + config.setFields("ssn|account"); + config.setReplacement("*"); + Scrubber scrubber = new ScrubResponseGatewayFilterFactory.Scrubber(config); + + JsonNode scrubbed = Mono.from(scrubber.apply(null, root)).block(); + assertNotNull(scrubbed); + assertEquals("*", scrubbed.get("ssn").asText()); + } + + @Test + void givenJsonWithoutFieldsToScrub_whenApply_theBodUnchanged() throws Exception{ + + JsonFactory jf = new JsonFactory(new ObjectMapper()); + JsonParser parser = jf.createParser(JSON_WITH_FIELDS_TO_SCRUB); + JsonNode root = parser.readValueAsTree(); + + Config config = new Config(); + config.setFields("xxxx"); + config.setReplacement("*"); + Scrubber scrubber = new ScrubResponseGatewayFilterFactory.Scrubber(config); + + JsonNode scrubbed = Mono.from(scrubber.apply(null, root)).block(); + assertNotNull(scrubbed); + assertNotEquals("*", scrubbed.get("ssn").asText()); + } + +} diff --git a/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterLiveTest.java new file mode 100644 index 0000000000..8906af774e --- /dev/null +++ b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ScrubResponseGatewayFilterLiveTest.java @@ -0,0 +1,135 @@ +package com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Collections; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.gateway.filter.factory.SetPathGatewayFilterFactory; +import org.springframework.cloud.gateway.route.RouteLocator; +import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.http.MediaType; +import org.springframework.http.client.reactive.ReactorClientHttpConnector; +import org.springframework.security.config.web.server.ServerHttpSecurity; +import org.springframework.security.web.server.SecurityWebFilterChain; +import org.springframework.test.web.reactive.server.WebTestClient; + +import com.sun.net.httpserver.HttpServer; + +import reactor.netty.http.client.HttpClient; + +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public class ScrubResponseGatewayFilterLiveTest { + + private static Logger log = LoggerFactory.getLogger(ScrubResponseGatewayFilterLiveTest.class); + + private static final String JSON_WITH_FIELDS_TO_SCRUB = "{\r\n" + + " \"name\" : \"John Doe\",\r\n" + + " \"ssn\" : \"123-45-9999\",\r\n" + + " \"account\" : \"9999888877770000\"\r\n" + + "}"; + + private static final String JSON_WITH_SCRUBBED_FIELDS = "{\r\n" + + " \"name\" : \"John Doe\",\r\n" + + " \"ssn\" : \"*\",\r\n" + + " \"account\" : \"9999888877770000\"\r\n" + + "}"; + + @LocalServerPort + String port; + + @Autowired + private WebTestClient client; + + @Autowired HttpServer server; + + @Test + public void givenRequestToScrubRoute_thenResponseScrubbed() { + + client.get() + .uri("/scrub") + .accept(MediaType.APPLICATION_JSON) + .exchange() + .expectStatus() + .is2xxSuccessful() + .expectHeader() + .contentType(MediaType.APPLICATION_JSON) + .expectBody() + .json(JSON_WITH_SCRUBBED_FIELDS); + } + + + @TestConfiguration + public static class TestRoutesConfiguration { + + + @Bean + public RouteLocator scrubSsnRoute(RouteLocatorBuilder builder, ScrubResponseGatewayFilterFactory scrubFilterFactory, SetPathGatewayFilterFactory pathFilterFactory, HttpServer server ) { + + log.info("[I92] Creating scrubSsnRoute..."); + + int mockServerPort = server.getAddress().getPort(); + ScrubResponseGatewayFilterFactory.Config config = new ScrubResponseGatewayFilterFactory.Config(); + config.setFields("ssn"); + config.setReplacement("*"); + + SetPathGatewayFilterFactory.Config pathConfig = new SetPathGatewayFilterFactory.Config(); + pathConfig.setTemplate("/customer"); + + return builder.routes() + .route("scrub_ssn", + r -> r.path("/scrub") + .filters( + f -> f + .filter(scrubFilterFactory.apply(config)) + .filter(pathFilterFactory.apply(pathConfig))) + .uri("http://localhost:" + mockServerPort )) + .build(); + } + + @Bean + public SecurityWebFilterChain testFilterChain(ServerHttpSecurity http ) { + + // @formatter:off + return http.authorizeExchange() + .anyExchange() + .permitAll() + .and() + .build(); + // @formatter:on + } + + @Bean + public HttpServer mockServer() throws IOException { + + log.info("[I48] Starting mock server..."); + + HttpServer server = HttpServer.create(new InetSocketAddress(0),0); + server.createContext("/customer", (exchange) -> { + exchange.getResponseHeaders().set("Content-Type", "application/json"); + + byte[] response = JSON_WITH_FIELDS_TO_SCRUB.getBytes("UTF-8"); + exchange.sendResponseHeaders(200,response.length); + exchange.getResponseBody().write(response); + }); + + server.setExecutor(null); + server.start(); + + log.info("[I65] Mock server started. port={}", server.getAddress().getPort()); + return server; + } + } +} From 7b420f92ec25bdc6859153b3ad088d3cbf56383c Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 12:50:39 +0500 Subject: [PATCH 66/86] Updated README.md added link back to the article: https://www.baeldung.com/jar-create-programatically --- core-java-modules/core-java-jar/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-java-modules/core-java-jar/README.md b/core-java-modules/core-java-jar/README.md index fe57ede08a..b1e24e3ab9 100644 --- a/core-java-modules/core-java-jar/README.md +++ b/core-java-modules/core-java-jar/README.md @@ -8,4 +8,5 @@ This module contains articles about JAR files - [Importance of Main Manifest Attribute in a Self-Executing JAR](http://www.baeldung.com/java-jar-executable-manifest-main-class) - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar) - [Get Names of Classes Inside a JAR File](https://www.baeldung.com/jar-file-get-class-names) - [Find All Jars Containing Given Class](https://baeldung.com/find-all-jars-containing-given-class/) \ No newline at end of file +- [Find All Jars Containing Given Class](https://baeldung.com/find-all-jars-containing-given-class/) +- [Creating JAR Files Programmatically](https://www.baeldung.com/jar-create-programatically) From fcc3512f38237ea41131af7649fd09980165f9a9 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 12:56:52 +0500 Subject: [PATCH 67/86] Updated README.md added link back to the article: https://www.baeldung.com/thymeleaf-js-function-call --- spring-web-modules/spring-thymeleaf/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-web-modules/spring-thymeleaf/README.md b/spring-web-modules/spring-thymeleaf/README.md index 12eb97b4a2..653e6df5b9 100644 --- a/spring-web-modules/spring-thymeleaf/README.md +++ b/spring-web-modules/spring-thymeleaf/README.md @@ -9,6 +9,7 @@ This module contains articles about Spring with Thymeleaf - [Spring MVC + Thymeleaf 3.0: New Features](https://www.baeldung.com/spring-thymeleaf-3) - [How to Work with Dates in Thymeleaf](https://www.baeldung.com/dates-in-thymeleaf) - [Working with Fragments in Thymeleaf](https://www.baeldung.com/spring-thymeleaf-fragments) +- [JavaScript Function Call with Thymeleaf](https://www.baeldung.com/thymeleaf-js-function-call) - [[next -->]](/spring-thymeleaf-2) ### Build the Project From cee261bdcbc3a92585ebee641f746b793a67e47b Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:43:46 +0500 Subject: [PATCH 68/86] Updated README.md added link back to the article: https://www.baeldung.com/java-check-number-parity --- core-java-modules/core-java-numbers-5/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-java-modules/core-java-numbers-5/README.md b/core-java-modules/core-java-numbers-5/README.md index 7d843af9ea..dd80febce9 100644 --- a/core-java-modules/core-java-numbers-5/README.md +++ b/core-java-modules/core-java-numbers-5/README.md @@ -1 +1,2 @@ ### Relevant Articles: +- [Check if a Number Is Odd or Even](https://www.baeldung.com/java-check-number-parity) From fabe15ba74ff8c5f99d8cbf86b675680feae58a3 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:53:32 +0500 Subject: [PATCH 69/86] Updated README.md added link back to the article: https://www.baeldung.com/hibernate-detached-entity-passed-to-persist --- persistence-modules/hibernate-exceptions/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-modules/hibernate-exceptions/README.md b/persistence-modules/hibernate-exceptions/README.md index c485de2f34..4acd6cd363 100644 --- a/persistence-modules/hibernate-exceptions/README.md +++ b/persistence-modules/hibernate-exceptions/README.md @@ -6,3 +6,4 @@ - [Hibernate’s “Object References an Unsaved Transient Instance” Error](https://www.baeldung.com/hibernate-unsaved-transient-instance-error) - [EntityNotFoundException in Hibernate](https://www.baeldung.com/hibernate-entitynotfoundexception) - [Hibernate’s “Not-Null Property References a Null or Transient Value” Error](https://www.baeldung.com/hibernate-not-null-error) +- [Hibernate's “Detached Entity Passed to Persist” Error](https://www.baeldung.com/hibernate-detached-entity-passed-to-persist) From 44629d87e0c635960aff5daf6c0d3b390a03d2ca Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:59:15 +0500 Subject: [PATCH 70/86] Created README.md added link back to the article: https://www.baeldung.com/mongodb-find --- persistence-modules/java-mongodb-3/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 persistence-modules/java-mongodb-3/README.md diff --git a/persistence-modules/java-mongodb-3/README.md b/persistence-modules/java-mongodb-3/README.md new file mode 100644 index 0000000000..3ffe5980da --- /dev/null +++ b/persistence-modules/java-mongodb-3/README.md @@ -0,0 +1,3 @@ + +### Relevant Artilces: +- [Guide to Find in MongoDB](https://www.baeldung.com/mongodb-find) From a82a1b7f0a0a3d73b3b947ce26eb574a77ec4a0b Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Mon, 27 Jun 2022 15:04:15 +0500 Subject: [PATCH 71/86] Updated README.md added link back to the article: https://www.baeldung.com/spring-data-mongodb-unique --- persistence-modules/spring-boot-persistence-mongodb-2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/README.md b/persistence-modules/spring-boot-persistence-mongodb-2/README.md index 45d3d192f1..f3be63c8b5 100644 --- a/persistence-modules/spring-boot-persistence-mongodb-2/README.md +++ b/persistence-modules/spring-boot-persistence-mongodb-2/README.md @@ -3,4 +3,5 @@ - [Logging MongoDB Queries with Spring Boot](https://www.baeldung.com/spring-boot-mongodb-logging) - [Configure MongoDB Collection Name for a Class in Spring Data](https://www.baeldung.com/spring-data-mongodb-collection-name) - [MongoDB Composite Key With Spring Data](https://www.baeldung.com/spring-data-mongodb-composite-key) +- [Unique Field in MongoDB Document in Spring Data](https://www.baeldung.com/spring-data-mongodb-unique) - More articles: [[<--prev]](../spring-boot-persistence-mongodb) From bb003c64a07515d3864ea70c1a6c2af8649d9040 Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Wed, 29 Jun 2022 18:51:58 +0500 Subject: [PATCH 72/86] Updated README.md edited link back to article from https://www.baeldung.com/expose-graphql-field-with-different-name to https://www.baeldung.com/graphql-field-name --- spring-boot-modules/spring-boot-libraries/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-modules/spring-boot-libraries/README.md b/spring-boot-modules/spring-boot-libraries/README.md index cc7e511ac8..68302d6d6f 100644 --- a/spring-boot-modules/spring-boot-libraries/README.md +++ b/spring-boot-modules/spring-boot-libraries/README.md @@ -14,7 +14,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Spring Boot and Caffeine Cache](https://www.baeldung.com/spring-boot-caffeine-cache) - [Spring Boot and Togglz Aspect](https://www.baeldung.com/spring-togglz) - [Getting Started with GraphQL and Spring Boot](https://www.baeldung.com/spring-graphql) -- [Expose GraphQL Field with Different Name](https://www.baeldung.com/expose-graphql-field-with-different-name) +- [Expose GraphQL Field with Different Name](https://www.baeldung.com/graphql-field-name) - More articles: [[next -->]](/spring-boot-modules/spring-boot-libraries-2) ### GraphQL sample queries From a07710d01146e61acfd49d338d974a4bcb0d93f9 Mon Sep 17 00:00:00 2001 From: Keerthi Date: Thu, 30 Jun 2022 00:42:01 +1000 Subject: [PATCH 73/86] JAVA-11500 : move quarkus related modules into quarkus-modules folder (#12419) * JAVA-11500 : move quarkus related modules into quarkus-modules folder * Update pom.xml * Update pom.xml * JAVA-11500 : added read me file * JAVA-11500 : addressed PR comments Co-authored-by: Loredana Crusoveanu Co-authored-by: Keerthi Gadde --- pom.xml | 16 +- quarkus-modules/README.md | 3 + quarkus-modules/pom.xml | 25 ++ .../quarkus-extension}/README.md | 0 .../quarkus-extension}/pom.xml | 2 +- .../quarkus-extension}/quarkus-app/pom.xml | 0 .../src/main/resources/application.properties | 0 .../db/liquibase-changelog-master.xml | 0 .../quarkus-liquibase/deployment/pom.xml | 0 .../quarkus/liquibase/LiquibaseProcessor.java | 0 .../quarkus-liquibase/pom.xml | 0 .../quarkus-liquibase/runtime/pom.xml | 0 .../quarkus/liquibase/LiquibaseConfig.java | 0 .../quarkus/liquibase/LiquibaseProducer.java | 0 .../quarkus/liquibase/LiquibaseRecorder.java | 0 .../quarkus-jandex}/README.md | 0 .../quarkus-jandex}/hello-app/.dockerignore | 0 .../quarkus-jandex}/hello-app/.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../quarkus-jandex}/hello-app/README.md | 0 .../quarkus-jandex}/hello-app/mvnw | 0 .../quarkus-jandex}/hello-app/mvnw.cmd | 0 .../quarkus-jandex}/hello-app/pom.xml | 0 .../hello-app/src/main/docker/Dockerfile.jvm | 0 .../src/main/docker/Dockerfile.legacy-jar | 0 .../src/main/docker/Dockerfile.native | 0 .../main/docker/Dockerfile.native-distroless | 0 .../baeldung/quarkus/hello/HelloResource.java | 0 .../resources/META-INF/resources/index.html | 0 .../src/main/resources/application.properties | 0 .../pom.xml | 0 .../ApplicationPropertiesHelloSender.java | 0 .../hello-sender-beans-xml/pom.xml | 0 .../sender/beansxml/BeansXmlHelloSender.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../hello-sender-maven-plugin/pom.xml | 0 .../mavenplugin/MavenPluginHelloSender.java | 0 .../hello-sender-undetected/pom.xml | 0 .../undetected/UndetectedHelloSender.java | 0 .../quarkus-jandex}/hello-service/pom.xml | 0 .../hello/service/HelloRetrieving.java | 0 .../quarkus/hello/service/HelloService.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../quarkus-jandex}/pom.xml | 6 + .../quarkus-vs-springboot}/README.md | 0 .../quarkus-vs-springboot}/cities.csv | 0 .../quarkus-vs-springboot}/load_test.jmx | 0 .../quarkus-vs-springboot}/pom.xml | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 0 .../quarkus-project/build.sh | 0 .../quarkus-project/mvnw | 0 .../quarkus-project}/mvnw.cmd | 376 +++++++++--------- .../quarkus-project/pom.xml | 0 .../src/main/docker/Dockerfile.jvm | 0 .../src/main/docker/Dockerfile.legacy-jar | 0 .../src/main/docker/Dockerfile.native | 0 .../main/docker/Dockerfile.native-distroless | 0 .../src/main/docker/quarkus.yml | 0 .../ReactiveGreetingResource.java | 0 .../com/baeldung/quarkus_project/ZipCode.java | 0 .../baeldung/quarkus_project/ZipCodeRepo.java | 0 .../quarkus_project/ZipCodeResource.java | 0 .../src/main/resources/application.properties | 0 .../NativeGreetingResourceIT.java | 0 .../quarkus-project/start_app.sh | 0 .../quarkus-project/start_jvm.sh | 0 .../quarkus-vs-springboot}/run_test.sh | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../spring-project/build_jvm_docker.sh | 0 .../spring-project/mvnw | 0 .../spring-project}/mvnw.cmd | 376 +++++++++--------- .../spring-project/pom.xml | 0 .../src/main/docker/Dockerfile.jvm | 0 .../spring-project/src/main/docker/spring.yml | 0 .../com/baeldung/spring_project/Startup.java | 0 .../baeldung/spring_project/ZipCodeApi.java | 0 .../spring_project/domain/ZIPRepo.java | 0 .../spring_project/domain/ZipCode.java | 0 .../src/main/resources/application.properties | 0 .../baeldung/spring_project/StartupIT.java | 0 .../src/test/resources/access-filter.json | 0 .../spring-project/start_app.sh | 0 .../spring-project/start_jvm.sh | 0 .../quarkus}/.dockerignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 .../quarkus}/README.md | 0 {quarkus => quarkus-modules/quarkus}/mvnw | 0 {quarkus => quarkus-modules/quarkus}/mvnw.cmd | 0 {quarkus => quarkus-modules/quarkus}/pom.xml | 2 +- .../quarkus}/src/main/docker/Dockerfile.jvm | 0 .../src/main/docker/Dockerfile.native | 0 .../com/baeldung/quarkus/HelloResource.java | 0 .../com/baeldung/quarkus/HelloService.java | 0 .../com/baeldung/quarkus/LibraryResource.java | 0 .../java/com/baeldung/quarkus/model/Book.java | 0 .../quarkus/repository/BookRepository.java | 0 .../quarkus/service/LibraryService.java | 0 .../resources/META-INF/resources/index.html | 0 .../src/main/resources/application.properties | 0 .../CustomLibraryResourceManualTest.java | 0 .../quarkus/HelloResourceUnitTest.java | 0 .../LibraryHttpEndpointIntegrationTest.java | 0 ...ryResourceHttpResourceIntegrationTest.java | 0 ...braryResourceInjectSpyIntegrationTest.java | 0 .../LibraryResourceIntegrationTest.java | 0 .../quarkus/NativeHelloResourceIT.java | 0 .../quarkus/NativeLibraryResourceIT.java | 0 .../BookRepositoryIntegrationTest.java | 0 .../LibraryServiceInjectMockUnitTest.java | 0 .../LibraryServiceIntegrationTest.java | 0 .../LibraryServiceQuarkusMockUnitTest.java | 0 .../quarkus/utils/CustomTestProfile.java | 0 .../utils/QuarkusTransactionalTest.java | 0 .../quarkus/utils/TestBookRepository.java | 0 116 files changed, 420 insertions(+), 388 deletions(-) create mode 100644 quarkus-modules/README.md create mode 100644 quarkus-modules/pom.xml rename {quarkus-extension => quarkus-modules/quarkus-extension}/README.md (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/pom.xml (92%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-app/pom.xml (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-app/src/main/resources/application.properties (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-app/src/main/resources/db/liquibase-changelog-master.xml (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/deployment/pom.xml (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/deployment/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProcessor.java (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/pom.xml (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/runtime/pom.xml (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseConfig.java (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProducer.java (100%) rename {quarkus-extension => quarkus-modules/quarkus-extension}/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseRecorder.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/README.md (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/.dockerignore (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/.gitignore (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/.mvn/wrapper/maven-wrapper.properties (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/README.md (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/mvnw (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/mvnw.cmd (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/docker/Dockerfile.jvm (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/docker/Dockerfile.legacy-jar (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/docker/Dockerfile.native (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/docker/Dockerfile.native-distroless (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/java/com/baeldung/quarkus/hello/HelloResource.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/resources/META-INF/resources/index.html (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-app/src/main/resources/application.properties (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-application-properties/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-application-properties/src/main/java/com/baeldung/quarkus/hello/sender/applicationproperties/ApplicationPropertiesHelloSender.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-beans-xml/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-beans-xml/src/main/java/com/baeldung/quarkus/hello/sender/beansxml/BeansXmlHelloSender.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-beans-xml/src/main/resources/META-INF/beans.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-maven-plugin/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-maven-plugin/src/main/java/com/baeldung/quarkus/hello/sender/mavenplugin/MavenPluginHelloSender.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-undetected/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-sender-undetected/src/main/java/com/baeldung/quarkus/hello/sender/undetected/UndetectedHelloSender.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-service/pom.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloRetrieving.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloService.java (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/hello-service/src/main/resources/META-INF/beans.xml (100%) rename {quarkus-jandex => quarkus-modules/quarkus-jandex}/pom.xml (92%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/README.md (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/cities.csv (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/load_test.jmx (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/pom.xml (91%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/.mvn/wrapper/maven-wrapper.properties (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/build.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/mvnw (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot/spring-project => quarkus-modules/quarkus-vs-springboot/quarkus-project}/mvnw.cmd (97%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/pom.xml (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/docker/Dockerfile.jvm (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/docker/Dockerfile.legacy-jar (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/docker/Dockerfile.native (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/docker/Dockerfile.native-distroless (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/docker/quarkus.yml (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/java/com/baeldung/quarkus_project/ReactiveGreetingResource.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCode.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeRepo.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeResource.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/main/resources/application.properties (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/src/test/java/com/baeldung/quarkus_project/NativeGreetingResourceIT.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/start_app.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/quarkus-project/start_jvm.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/run_test.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/.mvn/wrapper/maven-wrapper.properties (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/build_jvm_docker.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/mvnw (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot/quarkus-project => quarkus-modules/quarkus-vs-springboot/spring-project}/mvnw.cmd (97%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/pom.xml (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/docker/Dockerfile.jvm (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/docker/spring.yml (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/java/com/baeldung/spring_project/Startup.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/java/com/baeldung/spring_project/ZipCodeApi.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/java/com/baeldung/spring_project/domain/ZIPRepo.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/java/com/baeldung/spring_project/domain/ZipCode.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/main/resources/application.properties (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/test/java/com/baeldung/spring_project/StartupIT.java (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/src/test/resources/access-filter.json (100%) rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/start_app.sh (100%) mode change 100755 => 100644 rename {quarkus-vs-springboot => quarkus-modules/quarkus-vs-springboot}/spring-project/start_jvm.sh (100%) mode change 100755 => 100644 rename {quarkus => quarkus-modules/quarkus}/.dockerignore (100%) rename {quarkus => quarkus-modules/quarkus}/.mvn/wrapper/MavenWrapperDownloader.java (100%) mode change 100755 => 100644 rename {quarkus => quarkus-modules/quarkus}/.mvn/wrapper/maven-wrapper.properties (100%) mode change 100755 => 100644 rename {quarkus => quarkus-modules/quarkus}/README.md (100%) rename {quarkus => quarkus-modules/quarkus}/mvnw (100%) mode change 100755 => 100644 rename {quarkus => quarkus-modules/quarkus}/mvnw.cmd (100%) mode change 100755 => 100644 rename {quarkus => quarkus-modules/quarkus}/pom.xml (99%) rename {quarkus => quarkus-modules/quarkus}/src/main/docker/Dockerfile.jvm (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/docker/Dockerfile.native (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/HelloResource.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/HelloService.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/LibraryResource.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/model/Book.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/repository/BookRepository.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/java/com/baeldung/quarkus/service/LibraryService.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/resources/META-INF/resources/index.html (100%) rename {quarkus => quarkus-modules/quarkus}/src/main/resources/application.properties (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/CustomLibraryResourceManualTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/LibraryHttpEndpointIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/LibraryResourceHttpResourceIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/LibraryResourceInjectSpyIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/LibraryResourceIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/repository/BookRepositoryIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/service/LibraryServiceInjectMockUnitTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/service/LibraryServiceIntegrationTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/service/LibraryServiceQuarkusMockUnitTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/utils/CustomTestProfile.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/utils/QuarkusTransactionalTest.java (100%) rename {quarkus => quarkus-modules/quarkus}/src/test/java/com/baeldung/quarkus/utils/TestBookRepository.java (100%) diff --git a/pom.xml b/pom.xml index 5ecd457f7b..912a13f402 100644 --- a/pom.xml +++ b/pom.xml @@ -504,9 +504,8 @@ protobuffer - quarkus - quarkus-extension - + quarkus-modules + rabbitmq ratpack @@ -941,8 +940,7 @@ protobuffer - quarkus - quarkus-extension + quarkus-modules rabbitmq @@ -1254,8 +1252,8 @@ maven-modules/multimodulemavenproject persistence-modules/sirix persistence-modules/spring-data-cassandra-2 - quarkus-vs-springboot - quarkus-jandex + quarkus-modules/quarkus-vs-springboot + quarkus-modules/quarkus-jandex spring-boot-modules/spring-boot-cassandre spring-boot-modules/spring-boot-camel testing-modules/testing-assertions @@ -1322,8 +1320,8 @@ maven-modules/multimodulemavenproject persistence-modules/sirix persistence-modules/spring-data-cassandra-2 - quarkus-vs-springboot - quarkus-jandex + quarkus-modules/quarkus-vs-springboot + quarkus-modules/quarkus-jandex spring-boot-modules/spring-boot-cassandre spring-boot-modules/spring-boot-camel testing-modules/testing-assertions diff --git a/quarkus-modules/README.md b/quarkus-modules/README.md new file mode 100644 index 0000000000..aa45f710d0 --- /dev/null +++ b/quarkus-modules/README.md @@ -0,0 +1,3 @@ +## Quarkus Modules + +This module contains articles about quarkus. Actual articles go into its submodules. diff --git a/quarkus-modules/pom.xml b/quarkus-modules/pom.xml new file mode 100644 index 0000000000..86e2132035 --- /dev/null +++ b/quarkus-modules/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + quarkus-modules + quarkus-modules + pom + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + quarkus + quarkus-extension + + + + diff --git a/quarkus-extension/README.md b/quarkus-modules/quarkus-extension/README.md similarity index 100% rename from quarkus-extension/README.md rename to quarkus-modules/quarkus-extension/README.md diff --git a/quarkus-extension/pom.xml b/quarkus-modules/quarkus-extension/pom.xml similarity index 92% rename from quarkus-extension/pom.xml rename to quarkus-modules/quarkus-extension/pom.xml index c2ae66a3a0..a40d83e6ce 100644 --- a/quarkus-extension/pom.xml +++ b/quarkus-modules/quarkus-extension/pom.xml @@ -11,7 +11,7 @@ com.baeldung - parent-modules + quarkus-modules 1.0.0-SNAPSHOT diff --git a/quarkus-extension/quarkus-app/pom.xml b/quarkus-modules/quarkus-extension/quarkus-app/pom.xml similarity index 100% rename from quarkus-extension/quarkus-app/pom.xml rename to quarkus-modules/quarkus-extension/quarkus-app/pom.xml diff --git a/quarkus-extension/quarkus-app/src/main/resources/application.properties b/quarkus-modules/quarkus-extension/quarkus-app/src/main/resources/application.properties similarity index 100% rename from quarkus-extension/quarkus-app/src/main/resources/application.properties rename to quarkus-modules/quarkus-extension/quarkus-app/src/main/resources/application.properties diff --git a/quarkus-extension/quarkus-app/src/main/resources/db/liquibase-changelog-master.xml b/quarkus-modules/quarkus-extension/quarkus-app/src/main/resources/db/liquibase-changelog-master.xml similarity index 100% rename from quarkus-extension/quarkus-app/src/main/resources/db/liquibase-changelog-master.xml rename to quarkus-modules/quarkus-extension/quarkus-app/src/main/resources/db/liquibase-changelog-master.xml diff --git a/quarkus-extension/quarkus-liquibase/deployment/pom.xml b/quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/pom.xml similarity index 100% rename from quarkus-extension/quarkus-liquibase/deployment/pom.xml rename to quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/pom.xml diff --git a/quarkus-extension/quarkus-liquibase/deployment/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProcessor.java b/quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProcessor.java similarity index 100% rename from quarkus-extension/quarkus-liquibase/deployment/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProcessor.java rename to quarkus-modules/quarkus-extension/quarkus-liquibase/deployment/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProcessor.java diff --git a/quarkus-extension/quarkus-liquibase/pom.xml b/quarkus-modules/quarkus-extension/quarkus-liquibase/pom.xml similarity index 100% rename from quarkus-extension/quarkus-liquibase/pom.xml rename to quarkus-modules/quarkus-extension/quarkus-liquibase/pom.xml diff --git a/quarkus-extension/quarkus-liquibase/runtime/pom.xml b/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/pom.xml similarity index 100% rename from quarkus-extension/quarkus-liquibase/runtime/pom.xml rename to quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/pom.xml diff --git a/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseConfig.java b/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseConfig.java similarity index 100% rename from quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseConfig.java rename to quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseConfig.java diff --git a/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProducer.java b/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProducer.java similarity index 100% rename from quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProducer.java rename to quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseProducer.java diff --git a/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseRecorder.java b/quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseRecorder.java similarity index 100% rename from quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseRecorder.java rename to quarkus-modules/quarkus-extension/quarkus-liquibase/runtime/src/main/java/com/baeldung/quarkus/liquibase/LiquibaseRecorder.java diff --git a/quarkus-jandex/README.md b/quarkus-modules/quarkus-jandex/README.md similarity index 100% rename from quarkus-jandex/README.md rename to quarkus-modules/quarkus-jandex/README.md diff --git a/quarkus-jandex/hello-app/.dockerignore b/quarkus-modules/quarkus-jandex/hello-app/.dockerignore similarity index 100% rename from quarkus-jandex/hello-app/.dockerignore rename to quarkus-modules/quarkus-jandex/hello-app/.dockerignore diff --git a/quarkus-jandex/hello-app/.gitignore b/quarkus-modules/quarkus-jandex/hello-app/.gitignore similarity index 100% rename from quarkus-jandex/hello-app/.gitignore rename to quarkus-modules/quarkus-jandex/hello-app/.gitignore diff --git a/quarkus-jandex/hello-app/.mvn/wrapper/MavenWrapperDownloader.java b/quarkus-modules/quarkus-jandex/hello-app/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from quarkus-jandex/hello-app/.mvn/wrapper/MavenWrapperDownloader.java rename to quarkus-modules/quarkus-jandex/hello-app/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/quarkus-jandex/hello-app/.mvn/wrapper/maven-wrapper.properties b/quarkus-modules/quarkus-jandex/hello-app/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from quarkus-jandex/hello-app/.mvn/wrapper/maven-wrapper.properties rename to quarkus-modules/quarkus-jandex/hello-app/.mvn/wrapper/maven-wrapper.properties diff --git a/quarkus-jandex/hello-app/README.md b/quarkus-modules/quarkus-jandex/hello-app/README.md similarity index 100% rename from quarkus-jandex/hello-app/README.md rename to quarkus-modules/quarkus-jandex/hello-app/README.md diff --git a/quarkus-jandex/hello-app/mvnw b/quarkus-modules/quarkus-jandex/hello-app/mvnw similarity index 100% rename from quarkus-jandex/hello-app/mvnw rename to quarkus-modules/quarkus-jandex/hello-app/mvnw diff --git a/quarkus-jandex/hello-app/mvnw.cmd b/quarkus-modules/quarkus-jandex/hello-app/mvnw.cmd similarity index 100% rename from quarkus-jandex/hello-app/mvnw.cmd rename to quarkus-modules/quarkus-jandex/hello-app/mvnw.cmd diff --git a/quarkus-jandex/hello-app/pom.xml b/quarkus-modules/quarkus-jandex/hello-app/pom.xml similarity index 100% rename from quarkus-jandex/hello-app/pom.xml rename to quarkus-modules/quarkus-jandex/hello-app/pom.xml diff --git a/quarkus-jandex/hello-app/src/main/docker/Dockerfile.jvm b/quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus-jandex/hello-app/src/main/docker/Dockerfile.jvm rename to quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.jvm diff --git a/quarkus-jandex/hello-app/src/main/docker/Dockerfile.legacy-jar b/quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.legacy-jar similarity index 100% rename from quarkus-jandex/hello-app/src/main/docker/Dockerfile.legacy-jar rename to quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.legacy-jar diff --git a/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native b/quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native similarity index 100% rename from quarkus-jandex/hello-app/src/main/docker/Dockerfile.native rename to quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native diff --git a/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native-distroless b/quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native-distroless similarity index 100% rename from quarkus-jandex/hello-app/src/main/docker/Dockerfile.native-distroless rename to quarkus-modules/quarkus-jandex/hello-app/src/main/docker/Dockerfile.native-distroless diff --git a/quarkus-jandex/hello-app/src/main/java/com/baeldung/quarkus/hello/HelloResource.java b/quarkus-modules/quarkus-jandex/hello-app/src/main/java/com/baeldung/quarkus/hello/HelloResource.java similarity index 100% rename from quarkus-jandex/hello-app/src/main/java/com/baeldung/quarkus/hello/HelloResource.java rename to quarkus-modules/quarkus-jandex/hello-app/src/main/java/com/baeldung/quarkus/hello/HelloResource.java diff --git a/quarkus-jandex/hello-app/src/main/resources/META-INF/resources/index.html b/quarkus-modules/quarkus-jandex/hello-app/src/main/resources/META-INF/resources/index.html similarity index 100% rename from quarkus-jandex/hello-app/src/main/resources/META-INF/resources/index.html rename to quarkus-modules/quarkus-jandex/hello-app/src/main/resources/META-INF/resources/index.html diff --git a/quarkus-jandex/hello-app/src/main/resources/application.properties b/quarkus-modules/quarkus-jandex/hello-app/src/main/resources/application.properties similarity index 100% rename from quarkus-jandex/hello-app/src/main/resources/application.properties rename to quarkus-modules/quarkus-jandex/hello-app/src/main/resources/application.properties diff --git a/quarkus-jandex/hello-sender-application-properties/pom.xml b/quarkus-modules/quarkus-jandex/hello-sender-application-properties/pom.xml similarity index 100% rename from quarkus-jandex/hello-sender-application-properties/pom.xml rename to quarkus-modules/quarkus-jandex/hello-sender-application-properties/pom.xml diff --git a/quarkus-jandex/hello-sender-application-properties/src/main/java/com/baeldung/quarkus/hello/sender/applicationproperties/ApplicationPropertiesHelloSender.java b/quarkus-modules/quarkus-jandex/hello-sender-application-properties/src/main/java/com/baeldung/quarkus/hello/sender/applicationproperties/ApplicationPropertiesHelloSender.java similarity index 100% rename from quarkus-jandex/hello-sender-application-properties/src/main/java/com/baeldung/quarkus/hello/sender/applicationproperties/ApplicationPropertiesHelloSender.java rename to quarkus-modules/quarkus-jandex/hello-sender-application-properties/src/main/java/com/baeldung/quarkus/hello/sender/applicationproperties/ApplicationPropertiesHelloSender.java diff --git a/quarkus-jandex/hello-sender-beans-xml/pom.xml b/quarkus-modules/quarkus-jandex/hello-sender-beans-xml/pom.xml similarity index 100% rename from quarkus-jandex/hello-sender-beans-xml/pom.xml rename to quarkus-modules/quarkus-jandex/hello-sender-beans-xml/pom.xml diff --git a/quarkus-jandex/hello-sender-beans-xml/src/main/java/com/baeldung/quarkus/hello/sender/beansxml/BeansXmlHelloSender.java b/quarkus-modules/quarkus-jandex/hello-sender-beans-xml/src/main/java/com/baeldung/quarkus/hello/sender/beansxml/BeansXmlHelloSender.java similarity index 100% rename from quarkus-jandex/hello-sender-beans-xml/src/main/java/com/baeldung/quarkus/hello/sender/beansxml/BeansXmlHelloSender.java rename to quarkus-modules/quarkus-jandex/hello-sender-beans-xml/src/main/java/com/baeldung/quarkus/hello/sender/beansxml/BeansXmlHelloSender.java diff --git a/quarkus-jandex/hello-sender-beans-xml/src/main/resources/META-INF/beans.xml b/quarkus-modules/quarkus-jandex/hello-sender-beans-xml/src/main/resources/META-INF/beans.xml similarity index 100% rename from quarkus-jandex/hello-sender-beans-xml/src/main/resources/META-INF/beans.xml rename to quarkus-modules/quarkus-jandex/hello-sender-beans-xml/src/main/resources/META-INF/beans.xml diff --git a/quarkus-jandex/hello-sender-maven-plugin/pom.xml b/quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/pom.xml similarity index 100% rename from quarkus-jandex/hello-sender-maven-plugin/pom.xml rename to quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/pom.xml diff --git a/quarkus-jandex/hello-sender-maven-plugin/src/main/java/com/baeldung/quarkus/hello/sender/mavenplugin/MavenPluginHelloSender.java b/quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/src/main/java/com/baeldung/quarkus/hello/sender/mavenplugin/MavenPluginHelloSender.java similarity index 100% rename from quarkus-jandex/hello-sender-maven-plugin/src/main/java/com/baeldung/quarkus/hello/sender/mavenplugin/MavenPluginHelloSender.java rename to quarkus-modules/quarkus-jandex/hello-sender-maven-plugin/src/main/java/com/baeldung/quarkus/hello/sender/mavenplugin/MavenPluginHelloSender.java diff --git a/quarkus-jandex/hello-sender-undetected/pom.xml b/quarkus-modules/quarkus-jandex/hello-sender-undetected/pom.xml similarity index 100% rename from quarkus-jandex/hello-sender-undetected/pom.xml rename to quarkus-modules/quarkus-jandex/hello-sender-undetected/pom.xml diff --git a/quarkus-jandex/hello-sender-undetected/src/main/java/com/baeldung/quarkus/hello/sender/undetected/UndetectedHelloSender.java b/quarkus-modules/quarkus-jandex/hello-sender-undetected/src/main/java/com/baeldung/quarkus/hello/sender/undetected/UndetectedHelloSender.java similarity index 100% rename from quarkus-jandex/hello-sender-undetected/src/main/java/com/baeldung/quarkus/hello/sender/undetected/UndetectedHelloSender.java rename to quarkus-modules/quarkus-jandex/hello-sender-undetected/src/main/java/com/baeldung/quarkus/hello/sender/undetected/UndetectedHelloSender.java diff --git a/quarkus-jandex/hello-service/pom.xml b/quarkus-modules/quarkus-jandex/hello-service/pom.xml similarity index 100% rename from quarkus-jandex/hello-service/pom.xml rename to quarkus-modules/quarkus-jandex/hello-service/pom.xml diff --git a/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloRetrieving.java b/quarkus-modules/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloRetrieving.java similarity index 100% rename from quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloRetrieving.java rename to quarkus-modules/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloRetrieving.java diff --git a/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloService.java b/quarkus-modules/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloService.java similarity index 100% rename from quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloService.java rename to quarkus-modules/quarkus-jandex/hello-service/src/main/java/com/baeldung/quarkus/hello/service/HelloService.java diff --git a/quarkus-jandex/hello-service/src/main/resources/META-INF/beans.xml b/quarkus-modules/quarkus-jandex/hello-service/src/main/resources/META-INF/beans.xml similarity index 100% rename from quarkus-jandex/hello-service/src/main/resources/META-INF/beans.xml rename to quarkus-modules/quarkus-jandex/hello-service/src/main/resources/META-INF/beans.xml diff --git a/quarkus-jandex/pom.xml b/quarkus-modules/quarkus-jandex/pom.xml similarity index 92% rename from quarkus-jandex/pom.xml rename to quarkus-modules/quarkus-jandex/pom.xml index e3cdfa3835..a254716e42 100644 --- a/quarkus-jandex/pom.xml +++ b/quarkus-modules/quarkus-jandex/pom.xml @@ -8,6 +8,12 @@ 1.0.0-SNAPSHOT pom + + com.baeldung + quarkus-modules + 1.0.0-SNAPSHOT + + hello-service hello-sender-beans-xml diff --git a/quarkus-vs-springboot/README.md b/quarkus-modules/quarkus-vs-springboot/README.md similarity index 100% rename from quarkus-vs-springboot/README.md rename to quarkus-modules/quarkus-vs-springboot/README.md diff --git a/quarkus-vs-springboot/cities.csv b/quarkus-modules/quarkus-vs-springboot/cities.csv similarity index 100% rename from quarkus-vs-springboot/cities.csv rename to quarkus-modules/quarkus-vs-springboot/cities.csv diff --git a/quarkus-vs-springboot/load_test.jmx b/quarkus-modules/quarkus-vs-springboot/load_test.jmx similarity index 100% rename from quarkus-vs-springboot/load_test.jmx rename to quarkus-modules/quarkus-vs-springboot/load_test.jmx diff --git a/quarkus-vs-springboot/pom.xml b/quarkus-modules/quarkus-vs-springboot/pom.xml similarity index 91% rename from quarkus-vs-springboot/pom.xml rename to quarkus-modules/quarkus-vs-springboot/pom.xml index 1726d076da..2e9d0b8a7f 100644 --- a/quarkus-vs-springboot/pom.xml +++ b/quarkus-modules/quarkus-vs-springboot/pom.xml @@ -9,8 +9,8 @@ pom - parent-modules com.baeldung + quarkus-modules 1.0.0-SNAPSHOT diff --git a/quarkus-vs-springboot/quarkus-project/.mvn/wrapper/maven-wrapper.properties b/quarkus-modules/quarkus-vs-springboot/quarkus-project/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from quarkus-vs-springboot/quarkus-project/.mvn/wrapper/maven-wrapper.properties rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/.mvn/wrapper/maven-wrapper.properties diff --git a/quarkus-vs-springboot/quarkus-project/build.sh b/quarkus-modules/quarkus-vs-springboot/quarkus-project/build.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/quarkus-project/build.sh rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/build.sh diff --git a/quarkus-vs-springboot/quarkus-project/mvnw b/quarkus-modules/quarkus-vs-springboot/quarkus-project/mvnw old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/quarkus-project/mvnw rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/mvnw diff --git a/quarkus-vs-springboot/spring-project/mvnw.cmd b/quarkus-modules/quarkus-vs-springboot/quarkus-project/mvnw.cmd similarity index 97% rename from quarkus-vs-springboot/spring-project/mvnw.cmd rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/mvnw.cmd index 23b7079a3d..8a15b7f311 100644 --- a/quarkus-vs-springboot/spring-project/mvnw.cmd +++ b/quarkus-modules/quarkus-vs-springboot/quarkus-project/mvnw.cmd @@ -1,188 +1,188 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/quarkus-vs-springboot/quarkus-project/pom.xml b/quarkus-modules/quarkus-vs-springboot/quarkus-project/pom.xml similarity index 100% rename from quarkus-vs-springboot/quarkus-project/pom.xml rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/pom.xml diff --git a/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.jvm b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.jvm rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.jvm diff --git a/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.legacy-jar b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.legacy-jar similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.legacy-jar rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.legacy-jar diff --git a/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native diff --git a/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native-distroless b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native-distroless similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native-distroless rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/Dockerfile.native-distroless diff --git a/quarkus-vs-springboot/quarkus-project/src/main/docker/quarkus.yml b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/quarkus.yml similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/docker/quarkus.yml rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/docker/quarkus.yml diff --git a/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ReactiveGreetingResource.java b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ReactiveGreetingResource.java similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ReactiveGreetingResource.java rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ReactiveGreetingResource.java diff --git a/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCode.java b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCode.java similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCode.java rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCode.java diff --git a/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeRepo.java b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeRepo.java similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeRepo.java rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeRepo.java diff --git a/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeResource.java b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeResource.java similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeResource.java rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/java/com/baeldung/quarkus_project/ZipCodeResource.java diff --git a/quarkus-vs-springboot/quarkus-project/src/main/resources/application.properties b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/resources/application.properties similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/main/resources/application.properties rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/main/resources/application.properties diff --git a/quarkus-vs-springboot/quarkus-project/src/test/java/com/baeldung/quarkus_project/NativeGreetingResourceIT.java b/quarkus-modules/quarkus-vs-springboot/quarkus-project/src/test/java/com/baeldung/quarkus_project/NativeGreetingResourceIT.java similarity index 100% rename from quarkus-vs-springboot/quarkus-project/src/test/java/com/baeldung/quarkus_project/NativeGreetingResourceIT.java rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/src/test/java/com/baeldung/quarkus_project/NativeGreetingResourceIT.java diff --git a/quarkus-vs-springboot/quarkus-project/start_app.sh b/quarkus-modules/quarkus-vs-springboot/quarkus-project/start_app.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/quarkus-project/start_app.sh rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/start_app.sh diff --git a/quarkus-vs-springboot/quarkus-project/start_jvm.sh b/quarkus-modules/quarkus-vs-springboot/quarkus-project/start_jvm.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/quarkus-project/start_jvm.sh rename to quarkus-modules/quarkus-vs-springboot/quarkus-project/start_jvm.sh diff --git a/quarkus-vs-springboot/run_test.sh b/quarkus-modules/quarkus-vs-springboot/run_test.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/run_test.sh rename to quarkus-modules/quarkus-vs-springboot/run_test.sh diff --git a/quarkus-vs-springboot/spring-project/.mvn/wrapper/maven-wrapper.properties b/quarkus-modules/quarkus-vs-springboot/spring-project/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from quarkus-vs-springboot/spring-project/.mvn/wrapper/maven-wrapper.properties rename to quarkus-modules/quarkus-vs-springboot/spring-project/.mvn/wrapper/maven-wrapper.properties diff --git a/quarkus-vs-springboot/spring-project/build_jvm_docker.sh b/quarkus-modules/quarkus-vs-springboot/spring-project/build_jvm_docker.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/spring-project/build_jvm_docker.sh rename to quarkus-modules/quarkus-vs-springboot/spring-project/build_jvm_docker.sh diff --git a/quarkus-vs-springboot/spring-project/mvnw b/quarkus-modules/quarkus-vs-springboot/spring-project/mvnw old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/spring-project/mvnw rename to quarkus-modules/quarkus-vs-springboot/spring-project/mvnw diff --git a/quarkus-vs-springboot/quarkus-project/mvnw.cmd b/quarkus-modules/quarkus-vs-springboot/spring-project/mvnw.cmd similarity index 97% rename from quarkus-vs-springboot/quarkus-project/mvnw.cmd rename to quarkus-modules/quarkus-vs-springboot/spring-project/mvnw.cmd index 23b7079a3d..8a15b7f311 100644 --- a/quarkus-vs-springboot/quarkus-project/mvnw.cmd +++ b/quarkus-modules/quarkus-vs-springboot/spring-project/mvnw.cmd @@ -1,188 +1,188 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/quarkus-vs-springboot/spring-project/pom.xml b/quarkus-modules/quarkus-vs-springboot/spring-project/pom.xml similarity index 100% rename from quarkus-vs-springboot/spring-project/pom.xml rename to quarkus-modules/quarkus-vs-springboot/spring-project/pom.xml diff --git a/quarkus-vs-springboot/spring-project/src/main/docker/Dockerfile.jvm b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/docker/Dockerfile.jvm rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/docker/Dockerfile.jvm diff --git a/quarkus-vs-springboot/spring-project/src/main/docker/spring.yml b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/docker/spring.yml similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/docker/spring.yml rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/docker/spring.yml diff --git a/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/Startup.java b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/Startup.java similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/Startup.java rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/Startup.java diff --git a/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/ZipCodeApi.java b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/ZipCodeApi.java similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/ZipCodeApi.java rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/ZipCodeApi.java diff --git a/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZIPRepo.java b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZIPRepo.java similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZIPRepo.java rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZIPRepo.java diff --git a/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZipCode.java b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZipCode.java similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZipCode.java rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/java/com/baeldung/spring_project/domain/ZipCode.java diff --git a/quarkus-vs-springboot/spring-project/src/main/resources/application.properties b/quarkus-modules/quarkus-vs-springboot/spring-project/src/main/resources/application.properties similarity index 100% rename from quarkus-vs-springboot/spring-project/src/main/resources/application.properties rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/main/resources/application.properties diff --git a/quarkus-vs-springboot/spring-project/src/test/java/com/baeldung/spring_project/StartupIT.java b/quarkus-modules/quarkus-vs-springboot/spring-project/src/test/java/com/baeldung/spring_project/StartupIT.java similarity index 100% rename from quarkus-vs-springboot/spring-project/src/test/java/com/baeldung/spring_project/StartupIT.java rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/test/java/com/baeldung/spring_project/StartupIT.java diff --git a/quarkus-vs-springboot/spring-project/src/test/resources/access-filter.json b/quarkus-modules/quarkus-vs-springboot/spring-project/src/test/resources/access-filter.json similarity index 100% rename from quarkus-vs-springboot/spring-project/src/test/resources/access-filter.json rename to quarkus-modules/quarkus-vs-springboot/spring-project/src/test/resources/access-filter.json diff --git a/quarkus-vs-springboot/spring-project/start_app.sh b/quarkus-modules/quarkus-vs-springboot/spring-project/start_app.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/spring-project/start_app.sh rename to quarkus-modules/quarkus-vs-springboot/spring-project/start_app.sh diff --git a/quarkus-vs-springboot/spring-project/start_jvm.sh b/quarkus-modules/quarkus-vs-springboot/spring-project/start_jvm.sh old mode 100755 new mode 100644 similarity index 100% rename from quarkus-vs-springboot/spring-project/start_jvm.sh rename to quarkus-modules/quarkus-vs-springboot/spring-project/start_jvm.sh diff --git a/quarkus/.dockerignore b/quarkus-modules/quarkus/.dockerignore similarity index 100% rename from quarkus/.dockerignore rename to quarkus-modules/quarkus/.dockerignore diff --git a/quarkus/.mvn/wrapper/MavenWrapperDownloader.java b/quarkus-modules/quarkus/.mvn/wrapper/MavenWrapperDownloader.java old mode 100755 new mode 100644 similarity index 100% rename from quarkus/.mvn/wrapper/MavenWrapperDownloader.java rename to quarkus-modules/quarkus/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/quarkus/.mvn/wrapper/maven-wrapper.properties b/quarkus-modules/quarkus/.mvn/wrapper/maven-wrapper.properties old mode 100755 new mode 100644 similarity index 100% rename from quarkus/.mvn/wrapper/maven-wrapper.properties rename to quarkus-modules/quarkus/.mvn/wrapper/maven-wrapper.properties diff --git a/quarkus/README.md b/quarkus-modules/quarkus/README.md similarity index 100% rename from quarkus/README.md rename to quarkus-modules/quarkus/README.md diff --git a/quarkus/mvnw b/quarkus-modules/quarkus/mvnw old mode 100755 new mode 100644 similarity index 100% rename from quarkus/mvnw rename to quarkus-modules/quarkus/mvnw diff --git a/quarkus/mvnw.cmd b/quarkus-modules/quarkus/mvnw.cmd old mode 100755 new mode 100644 similarity index 100% rename from quarkus/mvnw.cmd rename to quarkus-modules/quarkus/mvnw.cmd diff --git a/quarkus/pom.xml b/quarkus-modules/quarkus/pom.xml similarity index 99% rename from quarkus/pom.xml rename to quarkus-modules/quarkus/pom.xml index 9342b1a4af..65c0cec603 100644 --- a/quarkus/pom.xml +++ b/quarkus-modules/quarkus/pom.xml @@ -10,7 +10,7 @@ com.baeldung - parent-modules + quarkus-modules 1.0.0-SNAPSHOT diff --git a/quarkus/src/main/docker/Dockerfile.jvm b/quarkus-modules/quarkus/src/main/docker/Dockerfile.jvm similarity index 100% rename from quarkus/src/main/docker/Dockerfile.jvm rename to quarkus-modules/quarkus/src/main/docker/Dockerfile.jvm diff --git a/quarkus/src/main/docker/Dockerfile.native b/quarkus-modules/quarkus/src/main/docker/Dockerfile.native similarity index 100% rename from quarkus/src/main/docker/Dockerfile.native rename to quarkus-modules/quarkus/src/main/docker/Dockerfile.native diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/HelloResource.java diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/HelloService.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java diff --git a/quarkus/src/main/java/com/baeldung/quarkus/LibraryResource.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/LibraryResource.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/LibraryResource.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/LibraryResource.java diff --git a/quarkus/src/main/java/com/baeldung/quarkus/model/Book.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/model/Book.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/model/Book.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/model/Book.java diff --git a/quarkus/src/main/java/com/baeldung/quarkus/repository/BookRepository.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/repository/BookRepository.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/repository/BookRepository.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/repository/BookRepository.java diff --git a/quarkus/src/main/java/com/baeldung/quarkus/service/LibraryService.java b/quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/service/LibraryService.java similarity index 100% rename from quarkus/src/main/java/com/baeldung/quarkus/service/LibraryService.java rename to quarkus-modules/quarkus/src/main/java/com/baeldung/quarkus/service/LibraryService.java diff --git a/quarkus/src/main/resources/META-INF/resources/index.html b/quarkus-modules/quarkus/src/main/resources/META-INF/resources/index.html similarity index 100% rename from quarkus/src/main/resources/META-INF/resources/index.html rename to quarkus-modules/quarkus/src/main/resources/META-INF/resources/index.html diff --git a/quarkus/src/main/resources/application.properties b/quarkus-modules/quarkus/src/main/resources/application.properties similarity index 100% rename from quarkus/src/main/resources/application.properties rename to quarkus-modules/quarkus/src/main/resources/application.properties diff --git a/quarkus/src/test/java/com/baeldung/quarkus/CustomLibraryResourceManualTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/CustomLibraryResourceManualTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/CustomLibraryResourceManualTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/CustomLibraryResourceManualTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/LibraryHttpEndpointIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryHttpEndpointIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/LibraryHttpEndpointIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryHttpEndpointIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceHttpResourceIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceHttpResourceIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceHttpResourceIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceHttpResourceIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceInjectSpyIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceInjectSpyIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceInjectSpyIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceInjectSpyIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/LibraryResourceIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/repository/BookRepositoryIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/repository/BookRepositoryIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/repository/BookRepositoryIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/repository/BookRepositoryIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceInjectMockUnitTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceInjectMockUnitTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceInjectMockUnitTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceInjectMockUnitTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceIntegrationTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceIntegrationTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceIntegrationTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceIntegrationTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceQuarkusMockUnitTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceQuarkusMockUnitTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceQuarkusMockUnitTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/service/LibraryServiceQuarkusMockUnitTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/utils/CustomTestProfile.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/CustomTestProfile.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/utils/CustomTestProfile.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/CustomTestProfile.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/utils/QuarkusTransactionalTest.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/QuarkusTransactionalTest.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/utils/QuarkusTransactionalTest.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/QuarkusTransactionalTest.java diff --git a/quarkus/src/test/java/com/baeldung/quarkus/utils/TestBookRepository.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/TestBookRepository.java similarity index 100% rename from quarkus/src/test/java/com/baeldung/quarkus/utils/TestBookRepository.java rename to quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/utils/TestBookRepository.java From fb599000dcbdd108383eb241f4483f42800b3e1e Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Wed, 29 Jun 2022 22:16:24 +0530 Subject: [PATCH 74/86] Delete quarkus/.mvn/wrapper directory (#12426) --- quarkus/.mvn/wrapper/maven-wrapper.jar | Bin 50709 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 quarkus/.mvn/wrapper/maven-wrapper.jar diff --git a/quarkus/.mvn/wrapper/maven-wrapper.jar b/quarkus/.mvn/wrapper/maven-wrapper.jar deleted file mode 100755 index e89f07c229cbd97f4e39b0eddba64604d1dca9f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50709 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 Date: Wed, 29 Jun 2022 22:19:16 +0530 Subject: [PATCH 75/86] JAVA-12671 Remove or Move .local-db folder present at the root of the repository (#12421) --- .local-db/todos.mv.db | Bin 20480 -> 0 bytes .local-db/topics.mv.db | Bin 16384 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .local-db/todos.mv.db delete mode 100644 .local-db/topics.mv.db diff --git a/.local-db/todos.mv.db b/.local-db/todos.mv.db deleted file mode 100644 index c081aa5aad90461a90d0c7fac9019601525a5933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI4PjA~c7{;T_TY+>L;KOdiz^ZMM0-hmJe=O@JTiPs4u`^5Ql3oH?qT8U3Y}igw zbl0AC8#e6g?Yi5(!YGoK6fZ%sqD}+!^+BOU*?Re-6ytgL*gYFJMw4ms($@Ij@ca$2 zRYg%6$&1VErEN5l35hdXZ6tFNFG*^vEkbY`D@j5cf00e*l5C8%|00`U$0lvtuiwpp6Oh~@ee-Y1Yi*8@r8Vv$u^$pEFSDhspbb1|q+olp{nu7~>mD0G6N|sv z=d|>u%C@|%v$nyuCfl~y*7`DwFGzDT9l7x`zQ1~M7|)9Kkc_`(`=>LKMe{gY#L1F| z92Weg%Xl;)O{Mxo|B4-dnWfWU`n;)rk+W)Qze^l*8MWY;C+DxoA%(0o^41aKt1$TH zRrr)A>%<(s#n_vws&MvL(HfW8<${JY+G8S`&hn|qWZ+_6aAjV86-9~MhpmgbUlo`2kBwAGM`LpXIvVZp^Bcu?0M_;YOH$?vT zs6U91cjAXph~&_bQRoB_+E;PAZCGtBZ6_8^M&o_dbHX0lS5o?Q2Q^8I6q|;nrKz4; zv4RaHZjD+P$1Q_s*f2ChH(N=&t;HiV9$8juD5J45PL+M+xQBkfUVDi4PV*|=&RI7Y zgx;C!1-bv;7t0mQI`{?1WEd~*KKOKAhZWUqA?|8$0eub<$>D))oFhW23 zQ4guqS$ZR7rL&|7XNmhrcgJV( zR$N(2|E=nM%tqmOy`!$G6?yk;ru*XmXzrta0-ts;L?8eJfB+Bx0zd!=0D*P=z0&`c z@6nG;s{hGG_5b=BaK8Tk|AoS;_No-vglU2D<^N~f|A71l`7eKX`JYI$QvR!}fC&qY zaQTl}`^I?5Ee1<|6GB^E%kSJQw0W>Z)kLa?-m2AL2{-jLQ%`uXq`iujlnIkk`8;M#Bzl`Y#+q6by?JeMBw-<{aLt@2?EgMHs z&%L+(b1U`GVZcAus#>MWZZ40*FfhZ+n~wqOeR*$a%3?HM#BWTc-21a%h>0ah664pK z>=OoNbEXFGm<|Hw3hY-0dlStFVbg{Y(bK3Zptk$zdM!TnTlE<&f$|PzUcOogO zbFcvcAOHk_01yBIKmZ5;0U!VbfB+Bx0w0yY5d8m-${!{N0zd!=00AHX1b_e#00KY& z2mk>f@DK#bkNmib0g%NxDL(bzhD%eYf00e*l5C8%|00_Jz+MYsg7Q)siE*U&Q`oF~@-+7i?_gj0X1gLI1l(HES*OtYKEm@a>-__NafzXz288 zZ&XM@+eZ5129_6~mrgK5nB(}rPQKv2Th7Wz1%c_;Xs1kejDL#h+-#tlN zPYWGwr;X7RB$j%#Gv#a6Txwsi@0U!VbfB+Bx a0zlwH6FBz2xBmY@9(`A%{=acg{{P=HZ%TOp From 103a374ba1cfe3a2eb61269db46b2bd247253774 Mon Sep 17 00:00:00 2001 From: "Christopher C. Smith" Date: Thu, 30 Jun 2022 00:01:55 -0400 Subject: [PATCH 76/86] Article/bael 5516 how to convert input stream to base64 string (#12219) * java-shallow-deep tutorial * BAEL-5516 How to Convert InputStream to base64 String - Junit test demonstrating the code * BAEL-5516 - How-to-Convert-InputStream-to-base64-String Cleaned up files * BAEL-5516 - How-to-Convert-InputStream-to-base64-String - updated per Jira comments * BAEL-5516 - How-to-Convert-InputStream-to-base64-String - rename and formatting to match Baeldung standards --- .../InputStreamToBase64UnitTest.java | 49 ++++++++++++++++++ .../src/test/resources/logo.png | Bin 0 -> 2599 bytes 2 files changed, 49 insertions(+) create mode 100644 core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtobase64/InputStreamToBase64UnitTest.java create mode 100644 core-java-modules/core-java-io-conversions-2/src/test/resources/logo.png diff --git a/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtobase64/InputStreamToBase64UnitTest.java b/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtobase64/InputStreamToBase64UnitTest.java new file mode 100644 index 0000000000..d8de202ba3 --- /dev/null +++ b/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtobase64/InputStreamToBase64UnitTest.java @@ -0,0 +1,49 @@ +package com.baeldung.inputstreamtobase64; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.InputStream; +import java.util.Base64; + +import org.apache.commons.io.IOUtils; +import org.junit.Test; +/** + * Test the Stream to base64 conversion + */ +public class InputStreamToBase64UnitTest { + + /** + * Test stream to base64 conversion + * @throws Exception + */ + @Test + public void givenABinaryInputStream_whenItIsConvertedToBase64_thenItCanBeDecoded() throws Exception { + // given a binary input stream + InputStream sourceStream = getClass().getClassLoader().getResourceAsStream("logo.png"); + byte[] sourceBytes = IOUtils.toByteArray(sourceStream); + + // when it is converted to base64 + String encodedString = Base64.getEncoder().encodeToString(sourceBytes); + assertNotNull(encodedString); + + // then it can be decoded + byte[] decodedBytes = Base64.getDecoder().decode(encodedString); + assertNotNull(decodedBytes); + assertTrue(decodedBytes.length == sourceBytes.length); + assertTrue(calculateChecksum(decodedBytes) == calculateChecksum(sourceBytes)); + } + + /** + * Calculate a checksum + * @param bytes array of bytes to check + * @return the total sum of all bytes + */ + private int calculateChecksum(byte[] bytes) { + int checksum = 0; + for(int index=0; index < bytes.length; index++) { + checksum+=bytes[index]; + } + return checksum; + } +} diff --git a/core-java-modules/core-java-io-conversions-2/src/test/resources/logo.png b/core-java-modules/core-java-io-conversions-2/src/test/resources/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6d7c8340705747fabe6b612c3c1ec9f5b7848e GIT binary patch literal 2599 zcmV+?3fT3DP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H13A9N> zK~#90?VEY59c2~3e+ODhfdVZ8qQHZoY+(^>*}^I<6;PB#poju7Ms`pn!6=|ng9Hgn zDhiSaHUUvc1qv>hma@~b6{M7%qAZogwzLIG`+olM&873^&D{ImeXo73nO|~~J7>=M zzB6;b`R4o1ITvbbYHDg~YHDg~YF0_qt<;|mv>!D!eMa40ovpqw(7x2vw2d0-N$NZk zO9tAfnwqvycUK>@JF5@0Z#AnfgH~i`>W0A4z)8U8E7S%9OPjQ@2C!ofyPO*lFZRmG zenuS+Y?B?%h=}j^(*Bdcgq&!6MBLh6{?+sXbwl+q^%C`QwX z5&!Jxwrf^0`ei_?n*e73-vT!3LsRdzVeH6j-G z)>k!vJ%LfcP||(4Ga?o>u{i>0M1-D?h$l*PwgEQF4m%@avbr(pVFy^;*kESSrF}>n z?)8D!fj>t?=_I3W1sn)$NSd6cM#Qt(xskw@nd;LKF|+ku7+}<|^N;igV}p zpx=&y&CiW=Co6>W{PVpFIt z%*n2(@b!wE&ik2cOummyc5HUdMc!5SE3~O?&+`zKgr^pE4 zQedKKgWME#XW$;nLzpA7zP{e7oxY%+3*1P$<|4y^8`U*4-A#b|fFnwDgA|gTOnTd` zI;dxqJfS_|o9ZC--xcRuMn&vCL*HV0TjW0{ski2IJ}?X2sjI2asB_fw8-1!n)C1M$ zb9M_%v2)bZ3jI!2_ft1kN2xa!&R>z)mCn%WV0C7}<~{W~^)geKQ*}u}r$1-tk8Md}3gm+IX)dEVz0IzzXGlhawEZf*5|KCaNui)u&ie5j|od&dHf-aX_;qCA_{@lyo%7L%xQg~R-M!&{ z;JCv5xU!(r$nfSlHzH=`1rae3=v5}PziB7Ru@lR7*F9l6aCAg0QO5wgSLofZTQlZhYzqSoOdP;tV z+Yb0#?)a35xVdqVJ$w_@59vCfi!~r;Mnu^%ryJ_S6{ns7Hp#w^RJVwTS4#9YsIbq^ zgjE^Z?OJ=-V`h@xasXSaJ4M8kC3;oA|_HAirHbNd1y}gXLM=i|rn^`(nj? zekZ4Ml_`HPt6)1rJwEeyoI0(f&y_n4ZTkOTkxom-OG!qRlE^ zGo@{BD9GoVk{GY%WcL(!x|e!e!QnU5u_e0Sw)v0sfm-#im1aJ4w78)~ zI@LSOk{0T4b$W&FLeoImso?uLneBS&A8cO3GDF=u=kI4s8OI`v)Ya7^?V7a7^OkzB zDf^jce^aKhEUTxwSiR7c6@9GWTiXLVlkaBt2e`p?rp#%c(JW7hS=kMQ375DFYmepk3m%E;6rnk=_q&BmTJ|T76_2{6`c-v{9_W6-w9I(gu9a5v z)Q8lcsQnq>uNeT;H7qaeFJq~x&U)3y^pAzo(#)DwA5%^HGZh25(^NCP=Ro<_+kc$Y z)Bq_T0eqHJTDlZ?6PQ-@AH(002ov JPDHLkV1hD%G=cyC literal 0 HcmV?d00001 From ffe5873397bda990ad24c1496bc6556a22f2e313 Mon Sep 17 00:00:00 2001 From: "tudor.marc" Date: Thu, 30 Jun 2022 10:22:11 +0300 Subject: [PATCH 77/86] BAEL-5560 - quick fix for negative numbers --- .../src/main/java/com/baeldung/evenodd/EvenOdd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java b/core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java index 5323dcbe11..ade3421ee7 100644 --- a/core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java +++ b/core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/evenodd/EvenOdd.java @@ -7,7 +7,7 @@ public class EvenOdd { } static boolean isOdd(int x) { - return x % 2 == 1; + return x % 2 != 0; } static boolean isOrEven(int x) { From 40e42f8d454a2b86461080d2260c569a6e00a6b7 Mon Sep 17 00:00:00 2001 From: mdabrowski-eu <57441874+mdabrowski-eu@users.noreply.github.com> Date: Thu, 30 Jun 2022 11:26:34 +0200 Subject: [PATCH 78/86] BAEL-5557 Split a stream into parts (#12238) * BAEL-5557 Split a stream into parts * BAEL-5557 fix main pom.xml * BAEL-5557 fix mvn profiles * BAEL-5557 articles with equals and hashcode * BAEL-5557 migrate assertions to assertj * BAEL-5557 better assertions --- core-java-modules/core-java-streams-4/pom.xml | 23 ++++- .../src/test/java/splitting/Article.java | 37 ++++++++ .../splitting/StreamSplittingUnitTest.java | 95 +++++++++++++++++++ core-java-modules/pom.xml | 3 +- pom.xml | 1 + 5 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 core-java-modules/core-java-streams-4/src/test/java/splitting/Article.java create mode 100644 core-java-modules/core-java-streams-4/src/test/java/splitting/StreamSplittingUnitTest.java diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml index 110ec50b8c..8c4d98979c 100644 --- a/core-java-modules/core-java-streams-4/pom.xml +++ b/core-java-modules/core-java-streams-4/pom.xml @@ -15,6 +15,16 @@ + + io.reactivex + rxjava + ${rx.java.version} + + + io.reactivex.rxjava2 + rxjava + ${rx.java2.version} + log4j log4j @@ -27,6 +37,13 @@ pom import + + org.assertj + assertj-core + 3.23.1 + test + + @@ -54,8 +71,10 @@ 3.1 - 1.8 - 1.8 + 12 + 12 + 1.2.5 + 2.2.2 \ No newline at end of file diff --git a/core-java-modules/core-java-streams-4/src/test/java/splitting/Article.java b/core-java-modules/core-java-streams-4/src/test/java/splitting/Article.java new file mode 100644 index 0000000000..fe1265df19 --- /dev/null +++ b/core-java-modules/core-java-streams-4/src/test/java/splitting/Article.java @@ -0,0 +1,37 @@ +package splitting; + +class Article { + private final String target; + private final boolean featured; + + public Article(String target, boolean featured) { + this.target = target; + this.featured = featured; + } + + public String getTarget() { + return target; + } + + public boolean isFeatured() { + return featured; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Article article = (Article) o; + + if (featured != article.featured) return false; + return target.equals(article.target); + } + + @Override + public int hashCode() { + int result = target.hashCode(); + result = 31 * result + (featured ? 1 : 0); + return result; + } +} diff --git a/core-java-modules/core-java-streams-4/src/test/java/splitting/StreamSplittingUnitTest.java b/core-java-modules/core-java-streams-4/src/test/java/splitting/StreamSplittingUnitTest.java new file mode 100644 index 0000000000..75c60af4ac --- /dev/null +++ b/core-java-modules/core-java-streams-4/src/test/java/splitting/StreamSplittingUnitTest.java @@ -0,0 +1,95 @@ +package splitting; + +import com.google.common.collect.Lists; +import org.junit.Test; +import rx.Observable; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; + +public class StreamSplittingUnitTest { + private final static List
articles = Lists.newArrayList( + new Article("Baeldung", true), + new Article("Baeldung", false), + new Article("Programming Daily", false), + new Article("The Code", false) + ); + + @Test + public void givenListOfArticles_shouldSplitListInTwoCategories_usingPartitioningBy() { + Map> groupedArticles = articles.stream().collect(Collectors.partitioningBy(a -> a.getTarget().equals("Baeldung"))); + + assertThat(groupedArticles.get(true)).containsExactly( + new Article("Baeldung", true), + new Article("Baeldung", false)); + assertThat(groupedArticles.get(false)).containsExactly( + new Article("Programming Daily", false), + new Article("The Code", false)); + } + + @Test + public void givenListOfArticles_shouldSplitListInMultipleCategories_usingGroupingBy() { + Map> groupedArticles = articles.stream().collect(Collectors.groupingBy(Article::getTarget)); + + assertThat(groupedArticles.get("Baeldung")).hasSize(2); + assertThat(groupedArticles.get("Programming Daily")).hasSize(1); + assertThat(groupedArticles.get("The Code")).hasSize(1); + + assertThat(groupedArticles.get("Baeldung")).containsExactly( + new Article("Baeldung", true), + new Article("Baeldung", false)); + assertThat(groupedArticles.get("Programming Daily")).containsExactly(new Article("Programming Daily", false)); + assertThat(groupedArticles.get("The Code")).containsExactly(new Article("The Code", false)); + } + + @Test + public void givenListOfArticles_shouldSplitListInTwoCategories_usingTeeing() { + List countedArticles = articles.stream().collect(Collectors.teeing( + Collectors.filtering(article -> article.getTarget().equals("Baeldung"), Collectors.counting()), + Collectors.filtering(article -> !article.getTarget().equals("Baeldung"), Collectors.counting()), + List::of)); + + assertThat(countedArticles.get(0)).isEqualTo(2); + assertThat(countedArticles.get(1)).isEqualTo(2); + } + + @Test + public void givenListOfArticles_shouldSplitListInTwoOVerlappingCategories_usingTeeing() { + List> groupedArticles = articles.stream().collect(Collectors.teeing( + Collectors.filtering(article -> article.getTarget().equals("Baeldung"), Collectors.toList()), + Collectors.filtering(Article::isFeatured, Collectors.toList()), + List::of)); + + assertThat(groupedArticles.get(0)).hasSize(2); + assertThat(groupedArticles.get(1)).hasSize(1); + + assertThat(groupedArticles.get(0)).containsExactly( + new Article("Baeldung", true), + new Article("Baeldung", false)); + assertThat(groupedArticles.get(1)).containsExactly(new Article("Baeldung", true)); + } + + @Test + public void givenListOfArticles_shouldSplitStreamInMultipleCategories_usingRxJava() { + Observable
observableArticles = Observable.from(articles); + + Observable
baeldungObservable = observableArticles.filter(article -> article.getTarget().equals("Baeldung")); + Observable
featuredObservable = observableArticles.filter(Article::isFeatured); + List
baeldungArticles = new ArrayList<>(); + List
featuredArticles = new ArrayList<>(); + baeldungObservable.subscribe(baeldungArticles::add); + featuredObservable.subscribe(featuredArticles::add); + + assertThat(baeldungArticles).hasSize(2); + assertThat(featuredArticles).hasSize(1); + + assertThat(baeldungArticles).containsExactly( + new Article("Baeldung", true), + new Article("Baeldung", false)); + assertThat(featuredArticles).containsExactly(new Article("Baeldung", true)); + } +} diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index e44c508ce2..6911ace6eb 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -115,7 +115,6 @@ core-java-streams core-java-streams-2 core-java-streams-3 - core-java-streams-4 core-java-string-algorithms core-java-string-algorithms-2 core-java-string-apis @@ -147,4 +146,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 912a13f402..0801fbab46 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,6 +1238,7 @@ core-java-modules/core-java-io-conversions-2 core-java-modules/core-java-jpms core-java-modules/core-java-os + core-java-modules/core-java-streams-4 core-java-modules/core-java-string-algorithms-3 core-java-modules/core-java-string-operations-3 core-java-modules/core-java-string-operations-4 From d4f968ec2ab501f1e1ab41377aa089b190576cde Mon Sep 17 00:00:00 2001 From: Asjad J <97493880+Asjad-J@users.noreply.github.com> Date: Thu, 30 Jun 2022 16:11:40 +0500 Subject: [PATCH 79/86] Updated README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit edited link title from "Lombok's @ToString Annotation" to "Lombok’s @ToString Annotation" --- lombok-modules/lombok-2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lombok-modules/lombok-2/README.md b/lombok-modules/lombok-2/README.md index 650dc5ddab..632d676567 100644 --- a/lombok-modules/lombok-2/README.md +++ b/lombok-modules/lombok-2/README.md @@ -7,5 +7,5 @@ This module contains articles about Project Lombok. - [Using Lombok’s @Accessors Annotation](https://www.baeldung.com/lombok-accessors) - [Declaring Val and Var Variables in Lombok](https://www.baeldung.com/java-lombok-val-var) - [Lombok Using @With Annotations](https://www.baeldung.com/lombok-with-annotations) -- [Lombok's @ToString Annotation](https://www.baeldung.com/lombok-tostring) +- [Lombok’s @ToString Annotation](https://www.baeldung.com/lombok-tostring) - More articles: [[<-- prev]](../lombok) From d331a6f2b20fc94e04a24ebde2336870329ddf42 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Thu, 30 Jun 2022 16:57:04 +0300 Subject: [PATCH 80/86] update links to docker article --- docker-modules/docker-internal-dto/pom.xml | 15 --------------- .../java/com/baeldung/docker/dto/VariableDto.java | 14 -------------- .../docker-push-to-private-repo/pom.xml | 8 ++++---- docker-modules/docker-sample-app/pom.xml | 9 +++++---- .../docker-spring-boot-postgres/pom.xml | 2 +- docker-modules/docker-spring-boot/pom.xml | 9 +++++---- docker-modules/pom.xml | 11 ++++------- 7 files changed, 19 insertions(+), 49 deletions(-) delete mode 100644 docker-modules/docker-internal-dto/pom.xml delete mode 100644 docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java diff --git a/docker-modules/docker-internal-dto/pom.xml b/docker-modules/docker-internal-dto/pom.xml deleted file mode 100644 index 467d46e7ae..0000000000 --- a/docker-modules/docker-internal-dto/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - docker-internal-dto - docker-internal-dto - - - com.baeldung.docker - docker-modules - 0.0.1 - - - diff --git a/docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java b/docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java deleted file mode 100644 index 2de3b734ea..0000000000 --- a/docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.docker.dto; - -public class VariableDto { - - private final String value; - - public VariableDto(String value) { - this.value = value; - } - - public String getValue() { - return value; - } -} diff --git a/docker-modules/docker-push-to-private-repo/pom.xml b/docker-modules/docker-push-to-private-repo/pom.xml index c45baa65c3..a7b3a4db52 100644 --- a/docker-modules/docker-push-to-private-repo/pom.xml +++ b/docker-modules/docker-push-to-private-repo/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 docker-push-to-private-repo - 0.0.1-SNAPSHOT docker-push-to-private-repo Example application to showcase how to push a docker image to a private repository - com.baeldung.docker - docker-modules - 0.0.1 + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 diff --git a/docker-modules/docker-sample-app/pom.xml b/docker-modules/docker-sample-app/pom.xml index 893fb4ebe2..56b32c9c2c 100644 --- a/docker-modules/docker-sample-app/pom.xml +++ b/docker-modules/docker-sample-app/pom.xml @@ -7,10 +7,11 @@ docker-sample-app Demo project for Spring Boot and Docker - - com.baeldung.docker - docker-modules - 0.0.1 + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 diff --git a/docker-modules/docker-spring-boot-postgres/pom.xml b/docker-modules/docker-spring-boot-postgres/pom.xml index 7a4ed1db3c..48c8ed64d8 100644 --- a/docker-modules/docker-spring-boot-postgres/pom.xml +++ b/docker-modules/docker-spring-boot-postgres/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung.docker + com.baeldung docker-spring-boot-postgres 0.0.1-SNAPSHOT docker-spring-boot-postgres diff --git a/docker-modules/docker-spring-boot/pom.xml b/docker-modules/docker-spring-boot/pom.xml index 22a5e254fe..1022f916c8 100644 --- a/docker-modules/docker-spring-boot/pom.xml +++ b/docker-modules/docker-spring-boot/pom.xml @@ -7,10 +7,11 @@ docker-spring-boot Demo project showing Spring Boot and Docker - - com.baeldung.docker - docker-modules - 0.0.1 + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 diff --git a/docker-modules/pom.xml b/docker-modules/pom.xml index 87c7960a7f..f17832c4eb 100644 --- a/docker-modules/pom.xml +++ b/docker-modules/pom.xml @@ -3,22 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung.docker + com.baeldung docker-modules - 0.0.1 + 1.0.0-SNAPSHOT docker-modules - Demo project showing Spring Boot and Docker pom com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + parent-modules + 1.0.0-SNAPSHOT - docker-internal-dto docker-spring-boot docker-sample-app docker-caching/single-module-caching From c8bc22acab6eb756faeacf6c52ebdd2d17b707a0 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 22:13:57 +0530 Subject: [PATCH 81/86] JAVA-12731: Move spring-session into spring-web-modules --- .../spring-session/README.md | 0 .../spring-session/pom.xml | 0 .../spring-session/spring-session-jdbc/README.md | 0 .../spring-session/spring-session-jdbc/pom.xml | 0 .../baeldung/springsessionjdbc/SpringSessionJdbcApplication.java | 0 .../springsessionjdbc/controller/SpringSessionJdbcController.java | 0 .../spring-session-jdbc/src/main/resources/application.properties | 0 .../spring-session-jdbc/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../springsessionjdbc/SpringSessionJdbcIntegrationTest.java | 0 .../spring-session/spring-session-mongodb/README.md | 0 .../spring-session/spring-session-mongodb/pom.xml | 0 .../springsessionmongodb/SpringSessionMongoDBApplication.java | 0 .../controller/SpringSessionMongoDBController.java | 0 .../src/main/resources/application.properties | 0 .../spring-session-mongodb/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../springsessionmongodb/SpringSessionMongoDBIntegrationTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-session/spring-session-redis/README.md | 0 .../spring-session/spring-session-redis/pom.xml | 0 .../java/com/baeldung/spring/session/PasswordEncoderConfig.java | 0 .../src/main/java/com/baeldung/spring/session/SecurityConfig.java | 0 .../main/java/com/baeldung/spring/session/SessionController.java | 0 .../java/com/baeldung/spring/session/SessionWebApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-session-redis/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextLiveTest.java | 0 .../baeldung/spring/session/SessionControllerIntegrationTest.java | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename {spring-security-modules => spring-web-modules}/spring-session/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java (100%) diff --git a/spring-security-modules/spring-session/README.md b/spring-web-modules/spring-session/README.md similarity index 100% rename from spring-security-modules/spring-session/README.md rename to spring-web-modules/spring-session/README.md diff --git a/spring-security-modules/spring-session/pom.xml b/spring-web-modules/spring-session/pom.xml similarity index 100% rename from spring-security-modules/spring-session/pom.xml rename to spring-web-modules/spring-session/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/README.md b/spring-web-modules/spring-session/spring-session-jdbc/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/README.md rename to spring-web-modules/spring-session/spring-session-jdbc/README.md diff --git a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml b/spring-web-modules/spring-session/spring-session-jdbc/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/pom.xml rename to spring-web-modules/spring-session/spring-session-jdbc/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/README.md b/spring-web-modules/spring-session/spring-session-mongodb/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/README.md rename to spring-web-modules/spring-session/spring-session-mongodb/README.md diff --git a/spring-security-modules/spring-session/spring-session-mongodb/pom.xml b/spring-web-modules/spring-session/spring-session-mongodb/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/pom.xml rename to spring-web-modules/spring-session/spring-session-mongodb/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-redis/README.md b/spring-web-modules/spring-session/spring-session-redis/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/README.md rename to spring-web-modules/spring-session/spring-session-redis/README.md diff --git a/spring-security-modules/spring-session/spring-session-redis/pom.xml b/spring-web-modules/spring-session/spring-session-redis/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/pom.xml rename to spring-web-modules/spring-session/spring-session-redis/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java From 3d8bef19adeb9e24b27aaa67f58e9f2eba4231a6 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 22:14:38 +0530 Subject: [PATCH 82/86] JAVA-12731: Modify parent pom files --- spring-security-modules/pom.xml | 3 +-- spring-web-modules/pom.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index 8d98395ab7..ce718e5661 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -44,8 +44,7 @@ spring-security-web-rest spring-security-web-sockets spring-security-web-thymeleaf - spring-security-web-x509 - spring-session + spring-security-web-x509 spring-social-login spring-security-opa diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index a5c23c1649..a2bdc9035e 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -41,6 +41,7 @@ spring-resttemplate spring-resttemplate-2 spring-resttemplate-3 + spring-session spring-thymeleaf spring-thymeleaf-2 spring-thymeleaf-3 From 3f8cc6a92cc01a35ed004ca6b9dfebc80acf8ec1 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Fri, 1 Jul 2022 16:55:58 +0300 Subject: [PATCH 83/86] BAEL-54445 reorganize docker modules --- docker-modules/docker-compose/README.md | 1 + .../{ => intro}/docker-compose.yml | 0 .../latest-image}/Dockerfile | 0 .../docker-compose-build-image.yaml | 0 .../docker-compose-with-image.yaml | 0 .../pom.xml | 3 +- .../docker/app/DockAppApplication.java | 0 .../docker/app/endpoint/MyController.java | 0 .../src/main/resources/application.properties | 0 .../app/DockAppApplicationUnitTest.java | 0 docker-modules/docker-containers/README.md | 2 + .../heapsizing}/Dockerfile | 0 .../pom.xml | 6 +- .../heapsizing/HeapSizingApplication.java | 0 .../docker/heapsizing/PrintXmxXms.java | 0 .../.gitignore | 0 .../README.md | 1 + .../projects/config/Dockerfile | 0 .../projects/config/nginx.conf | 0 .../projects/sample-site/docker/Dockerfile | 0 .../sample-site/docker/Dockerfile-from-base | 0 .../sample-site/docker/Dockerfile-script | 0 .../sample-site/docker/build-docker.sh | 0 .../projects/sample-site/html/index.html | 0 .../pom.xml | 5 +- .../private-repo}/Dockerfile | 0 .../com/baeldung/docker/MainApplication.java} | 6 +- .../controllers}/HelloWorldController.java | 2 +- .../src/main/resources/application.properties | 0 .../README.md | 3 - docker-modules/docker-sample-app/README.md | 3 - .../.mvn/wrapper/MavenWrapperDownloader.java | 117 ------- .../.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 - .../docker-spring-boot-postgres/mvnw | 310 ------------------ .../docker-spring-boot-postgres/mvnw.cmd | 182 ---------- docker-modules/docker-spring-boot/README.md | 1 + .../README.md | 0 .../git-strategies}/.gitmodules | 0 .../git-strategies}/Dockerfile | 0 docker-modules/heap-sizing/README.md | 3 - docker-modules/pom.xml | 8 +- 42 files changed, 20 insertions(+), 635 deletions(-) rename docker-modules/docker-compose/{ => intro}/docker-compose.yml (100%) rename docker-modules/{docker-sample-app => docker-compose/latest-image}/Dockerfile (100%) rename docker-modules/{docker-sample-app => docker-compose/latest-image}/docker-compose-build-image.yaml (100%) rename docker-modules/{docker-sample-app => docker-compose/latest-image}/docker-compose-with-image.yaml (100%) rename docker-modules/{docker-sample-app => docker-compose}/pom.xml (93%) rename docker-modules/{docker-sample-app => docker-compose}/src/main/java/com/baeldung/docker/app/DockAppApplication.java (100%) rename docker-modules/{docker-sample-app => docker-compose}/src/main/java/com/baeldung/docker/app/endpoint/MyController.java (100%) rename docker-modules/{docker-push-to-private-repo => docker-compose}/src/main/resources/application.properties (100%) rename docker-modules/{docker-sample-app => docker-compose}/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java (100%) create mode 100644 docker-modules/docker-containers/README.md rename docker-modules/{heap-sizing => docker-containers/heapsizing}/Dockerfile (100%) rename docker-modules/{heap-sizing => docker-containers}/pom.xml (92%) rename docker-modules/{heap-sizing => docker-containers}/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java (100%) rename docker-modules/{heap-sizing => docker-containers}/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java (100%) rename docker-modules/{docker-push-to-private-repo => docker-images}/.gitignore (100%) rename docker-modules/{docker-push-to-private-repo => docker-images}/README.md (51%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/config/Dockerfile (100%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/config/nginx.conf (100%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/sample-site/docker/Dockerfile (100%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/sample-site/docker/Dockerfile-from-base (100%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/sample-site/docker/Dockerfile-script (100%) rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/sample-site/docker/build-docker.sh (100%) mode change 100755 => 100644 rename docker-modules/{docker-include-outside-build-context => docker-images/files-outside-context}/projects/sample-site/html/index.html (100%) rename docker-modules/{docker-push-to-private-repo => docker-images}/pom.xml (85%) rename docker-modules/{docker-push-to-private-repo => docker-images/private-repo}/Dockerfile (100%) rename docker-modules/{docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java => docker-images/src/main/java/com/baeldung/docker/MainApplication.java} (56%) rename docker-modules/{docker-push-to-private-repo/src/main/java/com/baeldung/docker/push => docker-images/src/main/java/com/baeldung/docker/controllers}/HelloWorldController.java (86%) rename docker-modules/{docker-sample-app => docker-images}/src/main/resources/application.properties (100%) delete mode 100644 docker-modules/docker-include-outside-build-context/README.md delete mode 100644 docker-modules/docker-sample-app/README.md delete mode 100644 docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java delete mode 100644 docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar delete mode 100644 docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties delete mode 100755 docker-modules/docker-spring-boot-postgres/mvnw delete mode 100644 docker-modules/docker-spring-boot-postgres/mvnw.cmd rename docker-modules/{dockerfile-with-git => dockerfile}/README.md (100%) rename docker-modules/{dockerfile-with-git => dockerfile/git-strategies}/.gitmodules (100%) rename docker-modules/{dockerfile-with-git => dockerfile/git-strategies}/Dockerfile (100%) delete mode 100644 docker-modules/heap-sizing/README.md diff --git a/docker-modules/docker-compose/README.md b/docker-modules/docker-compose/README.md index 243e81fc80..fbb58107d3 100644 --- a/docker-modules/docker-compose/README.md +++ b/docker-modules/docker-compose/README.md @@ -1,4 +1,5 @@ ## Relevant Articles: - [Introduction to Docker Compose](https://www.baeldung.com/ops/docker-compose) +- [How to Get Docker-Compose to Always Use the Latest Image](https://www.baeldung.com/ops/docker-compose-latest-image) diff --git a/docker-modules/docker-compose/docker-compose.yml b/docker-modules/docker-compose/intro/docker-compose.yml similarity index 100% rename from docker-modules/docker-compose/docker-compose.yml rename to docker-modules/docker-compose/intro/docker-compose.yml diff --git a/docker-modules/docker-sample-app/Dockerfile b/docker-modules/docker-compose/latest-image/Dockerfile similarity index 100% rename from docker-modules/docker-sample-app/Dockerfile rename to docker-modules/docker-compose/latest-image/Dockerfile diff --git a/docker-modules/docker-sample-app/docker-compose-build-image.yaml b/docker-modules/docker-compose/latest-image/docker-compose-build-image.yaml similarity index 100% rename from docker-modules/docker-sample-app/docker-compose-build-image.yaml rename to docker-modules/docker-compose/latest-image/docker-compose-build-image.yaml diff --git a/docker-modules/docker-sample-app/docker-compose-with-image.yaml b/docker-modules/docker-compose/latest-image/docker-compose-with-image.yaml similarity index 100% rename from docker-modules/docker-sample-app/docker-compose-with-image.yaml rename to docker-modules/docker-compose/latest-image/docker-compose-with-image.yaml diff --git a/docker-modules/docker-sample-app/pom.xml b/docker-modules/docker-compose/pom.xml similarity index 93% rename from docker-modules/docker-sample-app/pom.xml rename to docker-modules/docker-compose/pom.xml index 56b32c9c2c..ccc6f61bd3 100644 --- a/docker-modules/docker-sample-app/pom.xml +++ b/docker-modules/docker-compose/pom.xml @@ -3,8 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - docker-sample-app - docker-sample-app + docker-compose Demo project for Spring Boot and Docker diff --git a/docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java b/docker-modules/docker-compose/src/main/java/com/baeldung/docker/app/DockAppApplication.java similarity index 100% rename from docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java rename to docker-modules/docker-compose/src/main/java/com/baeldung/docker/app/DockAppApplication.java diff --git a/docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java b/docker-modules/docker-compose/src/main/java/com/baeldung/docker/app/endpoint/MyController.java similarity index 100% rename from docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java rename to docker-modules/docker-compose/src/main/java/com/baeldung/docker/app/endpoint/MyController.java diff --git a/docker-modules/docker-push-to-private-repo/src/main/resources/application.properties b/docker-modules/docker-compose/src/main/resources/application.properties similarity index 100% rename from docker-modules/docker-push-to-private-repo/src/main/resources/application.properties rename to docker-modules/docker-compose/src/main/resources/application.properties diff --git a/docker-modules/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java b/docker-modules/docker-compose/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java similarity index 100% rename from docker-modules/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java rename to docker-modules/docker-compose/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java diff --git a/docker-modules/docker-containers/README.md b/docker-modules/docker-containers/README.md new file mode 100644 index 0000000000..a96ddccabb --- /dev/null +++ b/docker-modules/docker-containers/README.md @@ -0,0 +1,2 @@ +### Relevant Articles: + diff --git a/docker-modules/heap-sizing/Dockerfile b/docker-modules/docker-containers/heapsizing/Dockerfile similarity index 100% rename from docker-modules/heap-sizing/Dockerfile rename to docker-modules/docker-containers/heapsizing/Dockerfile diff --git a/docker-modules/heap-sizing/pom.xml b/docker-modules/docker-containers/pom.xml similarity index 92% rename from docker-modules/heap-sizing/pom.xml rename to docker-modules/docker-containers/pom.xml index 32c200c1c0..f50945b59a 100644 --- a/docker-modules/heap-sizing/pom.xml +++ b/docker-modules/docker-containers/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.docker - heap-sizing + docker-containers 0.0.1-SNAPSHOT heap-sizing Demo project for Spring Boot @@ -40,7 +40,7 @@ spring-boot-maven-plugin - heapsizing-demo + docker-demo @@ -50,7 +50,7 @@ 2.7.1 - heapsizing-demo-jib + docker-demo-jib diff --git a/docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java b/docker-modules/docker-containers/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java similarity index 100% rename from docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java rename to docker-modules/docker-containers/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java diff --git a/docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java b/docker-modules/docker-containers/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java similarity index 100% rename from docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java rename to docker-modules/docker-containers/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java diff --git a/docker-modules/docker-push-to-private-repo/.gitignore b/docker-modules/docker-images/.gitignore similarity index 100% rename from docker-modules/docker-push-to-private-repo/.gitignore rename to docker-modules/docker-images/.gitignore diff --git a/docker-modules/docker-push-to-private-repo/README.md b/docker-modules/docker-images/README.md similarity index 51% rename from docker-modules/docker-push-to-private-repo/README.md rename to docker-modules/docker-images/README.md index 61fe00e016..c86134c7a0 100644 --- a/docker-modules/docker-push-to-private-repo/README.md +++ b/docker-modules/docker-images/README.md @@ -1,3 +1,4 @@ ### Relevant Articles: - [Pushing a Docker Image to a Private Repository](https://www.baeldung.com/ops/docker-push-image-to-private-repository) +- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context) diff --git a/docker-modules/docker-include-outside-build-context/projects/config/Dockerfile b/docker-modules/docker-images/files-outside-context/projects/config/Dockerfile similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/config/Dockerfile rename to docker-modules/docker-images/files-outside-context/projects/config/Dockerfile diff --git a/docker-modules/docker-include-outside-build-context/projects/config/nginx.conf b/docker-modules/docker-images/files-outside-context/projects/config/nginx.conf similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/config/nginx.conf rename to docker-modules/docker-images/files-outside-context/projects/config/nginx.conf diff --git a/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile b/docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile rename to docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile diff --git a/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base b/docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile-from-base similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base rename to docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile-from-base diff --git a/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script b/docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile-script similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script rename to docker-modules/docker-images/files-outside-context/projects/sample-site/docker/Dockerfile-script diff --git a/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh b/docker-modules/docker-images/files-outside-context/projects/sample-site/docker/build-docker.sh old mode 100755 new mode 100644 similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh rename to docker-modules/docker-images/files-outside-context/projects/sample-site/docker/build-docker.sh diff --git a/docker-modules/docker-include-outside-build-context/projects/sample-site/html/index.html b/docker-modules/docker-images/files-outside-context/projects/sample-site/html/index.html similarity index 100% rename from docker-modules/docker-include-outside-build-context/projects/sample-site/html/index.html rename to docker-modules/docker-images/files-outside-context/projects/sample-site/html/index.html diff --git a/docker-modules/docker-push-to-private-repo/pom.xml b/docker-modules/docker-images/pom.xml similarity index 85% rename from docker-modules/docker-push-to-private-repo/pom.xml rename to docker-modules/docker-images/pom.xml index a7b3a4db52..fadf84e9dd 100644 --- a/docker-modules/docker-push-to-private-repo/pom.xml +++ b/docker-modules/docker-images/pom.xml @@ -3,9 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - docker-push-to-private-repo - docker-push-to-private-repo - Example application to showcase how to push a docker image to a private repository + docker-images + Example application to showcase Docker images features com.baeldung diff --git a/docker-modules/docker-push-to-private-repo/Dockerfile b/docker-modules/docker-images/private-repo/Dockerfile similarity index 100% rename from docker-modules/docker-push-to-private-repo/Dockerfile rename to docker-modules/docker-images/private-repo/Dockerfile diff --git a/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java b/docker-modules/docker-images/src/main/java/com/baeldung/docker/MainApplication.java similarity index 56% rename from docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java rename to docker-modules/docker-images/src/main/java/com/baeldung/docker/MainApplication.java index 7f516b3158..b5e46f3eac 100644 --- a/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java +++ b/docker-modules/docker-images/src/main/java/com/baeldung/docker/MainApplication.java @@ -1,13 +1,13 @@ -package com.baeldung.docker.push; +package com.baeldung.docker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class PushToPrivateRepoApplication { +public class MainApplication { public static void main(String[] args) { - SpringApplication.run(PushToPrivateRepoApplication.class, args); + SpringApplication.run(MainApplication .class, args); } } diff --git a/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java b/docker-modules/docker-images/src/main/java/com/baeldung/docker/controllers/HelloWorldController.java similarity index 86% rename from docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java rename to docker-modules/docker-images/src/main/java/com/baeldung/docker/controllers/HelloWorldController.java index 58486c3086..f7ade95075 100644 --- a/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java +++ b/docker-modules/docker-images/src/main/java/com/baeldung/docker/controllers/HelloWorldController.java @@ -1,4 +1,4 @@ -package com.baeldung.docker.push; +package com.baeldung.docker.controllers; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/docker-modules/docker-sample-app/src/main/resources/application.properties b/docker-modules/docker-images/src/main/resources/application.properties similarity index 100% rename from docker-modules/docker-sample-app/src/main/resources/application.properties rename to docker-modules/docker-images/src/main/resources/application.properties diff --git a/docker-modules/docker-include-outside-build-context/README.md b/docker-modules/docker-include-outside-build-context/README.md deleted file mode 100644 index 55cc564163..0000000000 --- a/docker-modules/docker-include-outside-build-context/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Relevant Articles: - -- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context) \ No newline at end of file diff --git a/docker-modules/docker-sample-app/README.md b/docker-modules/docker-sample-app/README.md deleted file mode 100644 index d35abbc7e5..0000000000 --- a/docker-modules/docker-sample-app/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Relevant Articles: - -- [How to Get Docker-Compose to Always Use the Latest Image](https://www.baeldung.com/ops/docker-compose-latest-image) \ No newline at end of file diff --git a/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index e76d1f3241..0000000000 --- a/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2007-present 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 - * - * https://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. - */ -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50710 zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^ z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN} zXvC<tOmX83grD8GSo_Lo?%lNfhD#EBgPo z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c> zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$UPDeE_53j${QfKN-0v-HG z(QfyvFNbwPK%^!eIo4ac1;b>c0vyf9}Xby@YY!lkz-UvNp zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^1?H1om1de0Da9M;Q=n zUfn{f87iVb^>Exl*nZ0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7 ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL%u9i`DSM4RdtEH#cW)6}+I-eE< z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI} zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83 zJL7+ncjI9nn!TlS_KYu5vn%f*@qa5F;| zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$ zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~ z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;; z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i z{|Zd9ou-;laGS_x=O}a+ zB||za<795A?_~Q=r=coQ+ZK@@ zId~hWQL<%)fI_WDIX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{ zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2 z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9 zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$>Ed%` z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ} z(||hyyQ)4Z1@wSlT94(-QKqkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5 zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9 z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s> ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2 zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|j>^Qf`A76K%_ubL`Zu?h4`b=IyL>1!=*%!_K)=XC z6d}4R5L+sI50Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I# zlTFFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC& zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$ zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_X%Rl1&Kd~Z(u z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0 z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+ zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl zib0v*{u-?cq}dDGyZ%$XRY=UkQwt2oGu`zQneZh$=^! zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(TpBs; zg$25D!Ry_`8xpS_OJdeo$qh#7U+cepZ??TII7_%AXsT$B z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr zJvD*y6;39&T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m z#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9 zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_ z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu; zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1 z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV zP8^KGZnp`(hVMZ;s=n~3r2y;LTwcJwoBW-(ndU-$03{RD zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx! zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&K zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l z*TYQn^NnUy%Ds}$f^=yQ+BM-a5X4^GHF=%PDrRfm_uqC zh{sKwIu|O0&jWb27;wzg4w5uA@TO_j(1X?8E>5Zfma|Ly7Bklq|s z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE) zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wTyl3!M1q+a zD9W{pCd%il*j&Ft z5H$nENf>>k$;SONGW`qo6`&qKs*T z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==Iu%}HvNliOqVBqG?P2va zQ;kRJ$J6j;+wP9cS za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+MmiaP-eq6_k;)i6_@WSJ zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9 z>&=i7*#tc0`?!==vk>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;< z+bhAbVD*bD=}iU`+PU+SBobTQ%S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8 zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp zF9#myUmO!wCeJIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY z&-&T{egB)&aV$3_aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc zRI+7g2V&k zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#? zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6 zWG18WJaPKMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY? zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IOk=y$dOls{6sRR`I5>|X zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1 zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^ z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC92|Sy0%WWWp={$(am!#l~f^W_oz78HX<0X#7 zp)p1u~M*o9W@O8P{0Qkg@Wa# z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@ zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5 z1^T^eB{_)Y<9)y{-4Rz@9_>;_7h;5D+@QcbF4Wv7hu)s0&==&6u)33 zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj= zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq z6lc*mvU=WS6=v9Lrl}&zRiu_6u;6g%_DU{9b+R z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBFKhx z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wfy?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w zOFTI8gX$ard6fAh&g=u&56%3^-6E2tpk*wx3HSCQ+t7+*iOs zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen- zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r zD?|MetfhdC;^2WG`7MCgs>TKKN=^=!x&Q~BzmQio_^l~LboTNT=I zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V? z;H2SbF>jP^GE(R1@%C==XQ@J=G9lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5dMe+*Gomky_l^54*rzXro$ z>LL)U5Ry>~FJi=*{JDc)_**c)-&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9 zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6 zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qodn#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{ z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(DfinaaWxP<+Y97Z#n#U~V zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L zWjo4l%n51@Kz-n%zeSCD`uB?T%FVk+KBI}=ve zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9 z35uzIrIuo4#WnF^_jcpC@uNNaYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T zAuQ6RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf; zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@ z$FU-;e4W}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*83l9mI zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW zmhHUxd)t%GQ9#ak5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu# zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK zLs>UtkT43LR2G$AOYHVailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB! zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJeTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d> z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec zo<1dyhsVsTw;ZkVcJ_0-h-T3G1W@q)_Q30LNv)W?FbMH+XJ* zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9 zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~* z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgBY_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7>C2m=oghKyxMbFNq#EVLgP0cH3q7H z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_ zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB! z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$ zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$ z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi# zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7RaRnH0Rc_&372={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G z70u6}?zmd?v+{`vCu-53_v5@z)X{oPC@P)iA3jK$`r zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5Ay`RLfY(EiwKkrx%@YN^^XuET;tE zmr-6~I7j!R!KrHu5CWGSChO6deaLWa*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p}O?7`}i7Lsf$-gBkuY*`Zb z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40 zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD~pMgq^KY)T*aBz@DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7 z?^XN}Gf_feGoG~BjUgVa*)O`>lX=$BSR2)uD<9 z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6v$6gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp z@tFGi*CQ~@Yc-?{cwu1 zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm zOxt~Rb3D{dz=nHMcY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb zq6hBGp%O1A+&%2>l0mpaIzbo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5PIso9j1;e zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8 z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R% zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid z9U$XVqxX3P=XCKj0*W>}L0~Em`(vG<>srF8+*kPrw z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#CVjzUZ z!sD2O*;d28zkl))m)YN7HDi^z5IuNo3^w(zy8 zszJG#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=|KshybNB6HgE^(r>HD{*}S}mO>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0 zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(Wlay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_ z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7 zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{ z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_ z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F} zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xUOL2 zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J-> z`(mzDJDM}QPu5i44**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~ zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8 zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD? zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq( z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEyPMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8 zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43? z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz! zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb| zY_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq;ul_ z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQr>3@wA;{EUbjNjlNd6$Mx zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu z2?^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*> z7MQgk6t9OqqXMln?zoMAJcc zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70 zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwfPO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp z4{I|}35=11u$;?|JFBEE*gb;T`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3? zWi-RoXhzRJV0&XE@ACc?+@6?)LQ2XNm4KfalMtsc%4!Fn0rl zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH> z{o!A7f;R-@eK9Vj7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367 zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~ zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435 z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tSOowM{BX@(zawtjl zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7 zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<- zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5ft)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4 zLK<69qcUuniIan-$A1+fR=?@+thwDIXtF1Tks@Br-xY zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!ZRPX`(ZkRGe7~q(4&gEi<$ch`5kQ?*1=GSqkeV z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T zw9p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$ zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{ zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*yONhZG=onhx>t4)RB`r6&TP$n zgmN*)eCqvgriBO-abHQ8ECN0bw?z5Bxpx z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg ziUbIFW#2tj`65~#2V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-j*+=--XGvCq#32Gh(=|qj5F?kmihk{%M&$}udW5)DHK zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{ zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_( zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT# zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O z15y^{4tQoeW9Lu%G&V$90x6F)xN6y_oIn;!Q zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~ zUpeyt7}_nd`t}j9BKqryOha{34erm)RmST)_9Aw)@ zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps|| z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez> zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(@VB)zweR%?IidwJyK5J!STzw&2RFx zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gVhkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_ zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U# ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH7qN}%PKcN|8%9=i)qS5+$L zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW zi7A5Wym*K+V8pkqqO-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~ zp0YJ_P~_a8j= zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x zLW(l}oAg1H`dU+Fv**;qw|ANDSRs>cGqL!Yw^`; zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14 zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55Xy|Kps&Xek*4_r=KDZ z+`TQuv|$l}MWLzA5Ay6Cvsa^7xvwXpy?`w(6vx4XJ zWuf1bVSb#U8{xlY4+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0hn>KZ+h-3=?Y3*R=#!fOX zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy- z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^ zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup zVTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0 zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l> zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G} z2XfmT0(|l!)XJb^E!#3z4oEGIsL(xd; zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1eYtUL9B72{i(ir&ls8g!pD ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)% z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q zMMdd$fH|!s{ zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b z8?9h)kvj9SF!Dr zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?BYlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6 z?sV;|?*=-{M<1+hXoj?@-$y+(^BJ1H~wQ9G8C0#^aEAyhDduNX@haoa=PuPp zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@ z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9 z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`># zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg` z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_x=E1h>T5`DPHz zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i z5>Q(o z=t$gPjgGh0&I7KY#k50V7DJRX<%^X z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-GDY(YkR{9RH(MiCnyRtd!LxXJ75z+?2 zGi@m^+2hKJ5sB1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6 zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY% zOL=GE_ENYxhcyUrEt9XlMNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+ zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQvH~d`MQs86R$|SKXHh zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R; zsUNJf&g&rKpuD0WD@=dDrPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl zrw3Sp151^9=}B})6@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2 zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv)NtmC zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{ zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi% zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@|htC z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM% zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J z^ww~c;ou|iyzpErDtlVU=`8N7JSu>4M z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN; z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~fB zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt* z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q>H_M=fM*L_Op-<_r zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92 zsS&FH(*w`qLIy$doc>RE&A5R?u zzkl1sxX|{*fLpXvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_d7%NEFP6+ zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4- zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z)=5k2tG zM|&Bp5kDTfb#vfuTTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7 zb?A-RKVm_vM5!9?C%qYdfRAw& zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6 z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-# zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-ykqrK?WWZ#a(bglI_-8pq74RK*KfQ z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~ zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1 zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@ z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxomG1#XPmn(?YH@E~_ED+W6mxs%x{%Z<$pW`~ON1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy zOgb-=f}|Hb*LQ$YdWg<(u7x3`PKF)B7ZfZ6;1FrNM63 z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{ zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^I>#vh+LyC;aaVWGbmkENr z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yoO@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^ zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^ z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6& zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1DsOrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhIM0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X% z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~( zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky! zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k zBi=6wE5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)LPvhyN3i4goB$3K8iV7uh zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUYkI9T1cEF;ObfxxI-yNuA=I$dCtz3ey znVkctYD*`fUuZ(57+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@ z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u zm_~}T{HeHj1bAlKl8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4 z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z) zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9% znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O zP%xrP1M6@oYhgo$ZWwrAsYLa4 z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@< zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)woZp~> zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD zc;i;KS+t$koh)E3)w0OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk# zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+niZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^ zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w< zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7 ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I zAL+3opNhJteu&mWQ@kQWPucmiP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5 zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{ zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^ z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3 zO5a`6gwFw(moEzqxh=yJ9M1FTn!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm z%RSLc#p}5_dO{GD=DEFr=Fc% z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;# zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~ zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN#z`nI{UNDRbo-wqa4NEls zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao zUq=TaL$P*IFgJzrGc>j1dDOd zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-f@s?^tmzs_j7t!k zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl- zGd|Cv~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7 zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$ z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q& z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5tK8a+thWE zg4VytZrwcS?7^ zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_ z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^aYa{~m%5#$$+R1? zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI_N*#MMCIq#HFifT zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5 zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$XG8$(&{A zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^2Z)SWo+b`y0gV^iRcZtz5!-05vF z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_ z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s= z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?NI z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P z5gTIzl{3!&(tor^BwZfR8j4k{7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3 zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2 z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+o$@nun`VI1Er7pjq>8V zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d z6h>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4 zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;ZXkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8 z221?Va!l1|Y5X1Y?{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt zA{CcxZLJR|4#{j7k~Tu*jkwz8QA|5G1$Cl895R`Zyp;irp1{KN){kB30O8P1W5;@bG znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2> z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;) z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kDfpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}u3d|eQ8*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo> ze9KdJoiM)RH*SB%^;TAdX-zEjA7@%y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+ zOwDhFvA(E|ER%a^cdh@^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh` zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm zAO&Im2flv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2 zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRDnf1gP{#2>`ffrAC% zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~ zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m( zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM z-{1Wm&p%%#eb_?x7i;bol EfAhh=DF6Tf diff --git a/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572ce9..0000000000 --- a/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/docker-modules/docker-spring-boot-postgres/mvnw b/docker-modules/docker-spring-boot-postgres/mvnw deleted file mode 100755 index a16b5431b4..0000000000 --- a/docker-modules/docker-spring-boot-postgres/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# https://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/docker-modules/docker-spring-boot-postgres/mvnw.cmd b/docker-modules/docker-spring-boot-postgres/mvnw.cmd deleted file mode 100644 index c8d43372c9..0000000000 --- a/docker-modules/docker-spring-boot-postgres/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/docker-modules/docker-spring-boot/README.md b/docker-modules/docker-spring-boot/README.md index 7b16790783..6bcff1380e 100644 --- a/docker-modules/docker-spring-boot/README.md +++ b/docker-modules/docker-spring-boot/README.md @@ -3,3 +3,4 @@ - [Creating Docker Images with Spring Boot](https://www.baeldung.com/spring-boot-docker-images) - [Starting Spring Boot Application in Docker With Profile](https://www.baeldung.com/spring-boot-docker-start-with-profile) - [Reusing Docker Layers with Spring Boot](https://www.baeldung.com/docker-layers-spring-boot) +- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) diff --git a/docker-modules/dockerfile-with-git/README.md b/docker-modules/dockerfile/README.md similarity index 100% rename from docker-modules/dockerfile-with-git/README.md rename to docker-modules/dockerfile/README.md diff --git a/docker-modules/dockerfile-with-git/.gitmodules b/docker-modules/dockerfile/git-strategies/.gitmodules similarity index 100% rename from docker-modules/dockerfile-with-git/.gitmodules rename to docker-modules/dockerfile/git-strategies/.gitmodules diff --git a/docker-modules/dockerfile-with-git/Dockerfile b/docker-modules/dockerfile/git-strategies/Dockerfile similarity index 100% rename from docker-modules/dockerfile-with-git/Dockerfile rename to docker-modules/dockerfile/git-strategies/Dockerfile diff --git a/docker-modules/heap-sizing/README.md b/docker-modules/heap-sizing/README.md deleted file mode 100644 index aa5167cc16..0000000000 --- a/docker-modules/heap-sizing/README.md +++ /dev/null @@ -1,3 +0,0 @@ -### Relevant Articles: - -- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) diff --git a/docker-modules/pom.xml b/docker-modules/pom.xml index f17832c4eb..f2b8f059a1 100644 --- a/docker-modules/pom.xml +++ b/docker-modules/pom.xml @@ -16,11 +16,13 @@ - docker-spring-boot - docker-sample-app docker-caching/single-module-caching docker-caching/multi-module-caching - docker-push-to-private-repo + docker-compose + docker-containers + docker-images + docker-spring-boot + docker-spring-boot-postgres From f46636529b1cc8e85248f26c86f18c7f9a104052 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Fri, 1 Jul 2022 17:50:57 +0300 Subject: [PATCH 84/86] set java 8 version --- docker-modules/docker-compose/pom.xml | 4 ---- docker-modules/docker-containers/pom.xml | 5 ----- docker-modules/docker-images/pom.xml | 4 ---- docker-modules/docker-spring-boot-postgres/pom.xml | 4 ---- ...moApplicationTests.java => SpringContextLiveTest.java} | 8 ++++---- docker-modules/docker-spring-boot/pom.xml | 4 ---- 6 files changed, 4 insertions(+), 25 deletions(-) rename docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/{DemoApplicationTests.java => SpringContextLiveTest.java} (67%) diff --git a/docker-modules/docker-compose/pom.xml b/docker-modules/docker-compose/pom.xml index ccc6f61bd3..29981f2ccc 100644 --- a/docker-modules/docker-compose/pom.xml +++ b/docker-modules/docker-compose/pom.xml @@ -39,8 +39,4 @@ - - 11 - - \ No newline at end of file diff --git a/docker-modules/docker-containers/pom.xml b/docker-modules/docker-containers/pom.xml index f50945b59a..42c2d403e4 100644 --- a/docker-modules/docker-containers/pom.xml +++ b/docker-modules/docker-containers/pom.xml @@ -6,7 +6,6 @@ com.baeldung.docker docker-containers 0.0.1-SNAPSHOT - heap-sizing Demo project for Spring Boot @@ -57,8 +56,4 @@ - - 11 - - \ No newline at end of file diff --git a/docker-modules/docker-images/pom.xml b/docker-modules/docker-images/pom.xml index fadf84e9dd..5f6510cf8d 100644 --- a/docker-modules/docker-images/pom.xml +++ b/docker-modules/docker-images/pom.xml @@ -39,8 +39,4 @@ - - 11 - - \ No newline at end of file diff --git a/docker-modules/docker-spring-boot-postgres/pom.xml b/docker-modules/docker-spring-boot-postgres/pom.xml index 48c8ed64d8..3c2a523c16 100644 --- a/docker-modules/docker-spring-boot-postgres/pom.xml +++ b/docker-modules/docker-spring-boot-postgres/pom.xml @@ -42,8 +42,4 @@ - - 11 - - \ No newline at end of file diff --git a/docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java b/docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/SpringContextLiveTest.java similarity index 67% rename from docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java rename to docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/SpringContextLiveTest.java index 87bd1dd6ba..c007afcb9c 100644 --- a/docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java +++ b/docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/SpringContextLiveTest.java @@ -4,10 +4,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class DemoApplicationTests { +class SpringContextLiveTest { - @Test - void contextLoads() { - } + @Test + void contextLoads() { + } } diff --git a/docker-modules/docker-spring-boot/pom.xml b/docker-modules/docker-spring-boot/pom.xml index 1022f916c8..9732ed294d 100644 --- a/docker-modules/docker-spring-boot/pom.xml +++ b/docker-modules/docker-spring-boot/pom.xml @@ -54,8 +54,4 @@ - - 11 - - \ No newline at end of file From 7f8a2bcdd38f515949687eb7ab9510a1b8fe15e8 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Fri, 1 Jul 2022 18:32:56 +0300 Subject: [PATCH 85/86] Update README.md --- docker-modules/docker-containers/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-modules/docker-containers/README.md b/docker-modules/docker-containers/README.md index a96ddccabb..aa5167cc16 100644 --- a/docker-modules/docker-containers/README.md +++ b/docker-modules/docker-containers/README.md @@ -1,2 +1,3 @@ ### Relevant Articles: +- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) From 51d558e14b8a705f04a96a79c03fa317ef2aa9cc Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Fri, 1 Jul 2022 18:38:24 +0300 Subject: [PATCH 86/86] Update README.md --- docker-modules/docker-spring-boot/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-modules/docker-spring-boot/README.md b/docker-modules/docker-spring-boot/README.md index 6bcff1380e..7b16790783 100644 --- a/docker-modules/docker-spring-boot/README.md +++ b/docker-modules/docker-spring-boot/README.md @@ -3,4 +3,3 @@ - [Creating Docker Images with Spring Boot](https://www.baeldung.com/spring-boot-docker-images) - [Starting Spring Boot Application in Docker With Profile](https://www.baeldung.com/spring-boot-docker-start-with-profile) - [Reusing Docker Layers with Spring Boot](https://www.baeldung.com/docker-layers-spring-boot) -- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size)