diff --git a/apache-cxf-modules/README.md b/apache-cxf-modules/README.md index 88edaf4e13..cd45c371fe 100644 --- a/apache-cxf-modules/README.md +++ b/apache-cxf-modules/README.md @@ -4,6 +4,4 @@ This module contains articles about Apache CXF ## Relevant Articles: -- [Apache CXF Support for RESTful Web Services](https://www.baeldung.com/apache-cxf-rest-api) -- [A Guide to Apache CXF with Spring](https://www.baeldung.com/apache-cxf-with-spring) -- [Introduction to Apache CXF](https://www.baeldung.com/introduction-to-apache-cxf) +- [Introduction to Apache CXF Aegis Data Binding](https://www.baeldung.com/aegis-data-binding-in-apache-cxf) diff --git a/apache-cxf-modules/cxf-introduction/README.md b/apache-cxf-modules/cxf-introduction/README.md index 9a076524b7..3eef167785 100644 --- a/apache-cxf-modules/cxf-introduction/README.md +++ b/apache-cxf-modules/cxf-introduction/README.md @@ -1,2 +1,2 @@ ### Relevant Articles: -- [Introduction to Apache CXF](http://www.baeldung.com/introduction-to-apache-cxf) +- [Introduction to Apache CXF](https://www.baeldung.com/introduction-to-apache-cxf) diff --git a/axon/pom.xml b/axon/pom.xml index 00e3f0f4c5..f37344dc81 100644 --- a/axon/pom.xml +++ b/axon/pom.xml @@ -19,7 +19,7 @@ org.axonframework axon-bom - ${axon.version} + ${axon-bom.version} pom import @@ -57,7 +57,7 @@ - 4.5.0 + 4.5.13 \ No newline at end of file diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml index bcce82c94c..eac47bc093 100644 --- a/cas/cas-secured-app/pom.xml +++ b/cas/cas-secured-app/pom.xml @@ -10,10 +10,9 @@ Demo project for CAS - com.baeldung - parent-boot-2 + com.baeldung.cas + cas 0.0.1-SNAPSHOT - ../../parent-boot-2 diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java index 4a2c609758..ca37535f2c 100644 --- a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java @@ -88,7 +88,6 @@ public class CasSecuredApplication { @Bean public SingleSignOutFilter singleSignOutFilter() { SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter(); - singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443"); singleSignOutFilter.setLogoutCallbackPath("/exit/cas"); singleSignOutFilter.setIgnoreInitConfiguration(true); return singleSignOutFilter; diff --git a/cas/pom.xml b/cas/pom.xml new file mode 100644 index 0000000000..4d8695dad8 --- /dev/null +++ b/cas/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + com.baeldung.cas + cas + cas + pom + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + + cas-secured-app + + + diff --git a/core-java-modules/core-java-11-2/README.md b/core-java-modules/core-java-11-2/README.md index ebd857886d..b864e1ca99 100644 --- a/core-java-modules/core-java-11-2/README.md +++ b/core-java-modules/core-java-11-2/README.md @@ -13,3 +13,4 @@ This module contains articles about Java 11 core features - [Call Methods at Runtime Using Java Reflection](https://www.baeldung.com/java-method-reflection) - [Java HttpClient Basic Authentication](https://www.baeldung.com/java-httpclient-basic-auth) - [Java HttpClient With SSL](https://www.baeldung.com/java-httpclient-ssl) +- [Adding Parameters to Java HttpClient Requests](https://www.baeldung.com/java-httpclient-request-parameters) diff --git a/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/parameters/HttpClientParametersLiveTest.java b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/parameters/HttpClientParametersLiveTest.java new file mode 100644 index 0000000000..429825c550 --- /dev/null +++ b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/parameters/HttpClientParametersLiveTest.java @@ -0,0 +1,45 @@ +package com.baeldung.httpclient.parameters; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class HttpClientParametersLiveTest { + + private static HttpClient client; + + @BeforeAll + public static void setUp() { + client = HttpClient.newHttpClient(); + } + + @Test + public void givenQueryParams_whenGetRequest_thenResponseOk() throws IOException, InterruptedException { + HttpRequest request = HttpRequest.newBuilder() + .version(HttpClient.Version.HTTP_2) + .uri(URI.create("https://postman-echo.com/get?param1=value1¶m2=value2")) + .GET() + .build(); + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + + assertEquals(response.statusCode(), 200); + } + + @Test + public void givenQueryParams_whenGetRequestWithDefaultConfiguration_thenResponseOk() throws IOException, InterruptedException { + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create("https://postman-echo.com/get?param1=value1¶m2=value2")) + .build(); + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + + assertEquals(response.statusCode(), 200); + } + +} diff --git a/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/ssl/HttpClientSSLBypassUnitTest.java b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/ssl/HttpClientSSLBypassUnitTest.java index 29c1538c85..68fcaae6d1 100644 --- a/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/ssl/HttpClientSSLBypassUnitTest.java +++ b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/ssl/HttpClientSSLBypassUnitTest.java @@ -21,7 +21,7 @@ public class HttpClientSSLBypassUnitTest { .build(); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create("https://www.testingmcafeesites.com/")) + .uri(URI.create("https://wrong.host.badssl.com/")) .build(); HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); diff --git a/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/CleaningDemo.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/CleaningDemo.java new file mode 100644 index 0000000000..bb7ba44e4a --- /dev/null +++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/CleaningDemo.java @@ -0,0 +1,17 @@ +package com.bealdung.java9.finalizers; + +import java.lang.ref.Cleaner; + +class CleaningDemo { + + public static void main(String[] args) { + final Cleaner cleaner = Cleaner.create(); + try (Order order = new Order(cleaner)) { + for (int i = 0; i < 10; i++) { + order.register(new Product(i), i); + } + } catch (Exception e) { + System.err.println("Error: " + e); + } + } +} diff --git a/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Order.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Order.java new file mode 100644 index 0000000000..82b43caf7d --- /dev/null +++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Order.java @@ -0,0 +1,36 @@ +package com.bealdung.java9.finalizers; + +import java.lang.ref.Cleaner; + +class Order implements AutoCloseable { + + private final Cleaner cleaner; + private Cleaner.Cleanable cleanable; + + public Order(Cleaner cleaner) { + this.cleaner = cleaner; + } + + public void register(Product product, int id) { + this.cleanable = cleaner.register(product, new CleaningAction(id)); + } + + public void close() { + cleanable.clean(); + System.out.println("Cleanable closed"); + } + + static class CleaningAction implements Runnable { + + private final int id; + + public CleaningAction(int id) { + this.id = id; + } + + @Override + public void run() { + System.out.printf("Object with id %s is garbage collected. %n", id); + } + } +} diff --git a/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Product.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Product.java new file mode 100644 index 0000000000..7a2f95efad --- /dev/null +++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Product.java @@ -0,0 +1,13 @@ +package com.bealdung.java9.finalizers; + +class Product { + private final int id; + + public Product(int id) { + this.id = id; + } + + public int getId() { + return id; + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Resource.java b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Resource.java new file mode 100644 index 0000000000..f4b348e796 --- /dev/null +++ b/core-java-modules/core-java-9/src/main/java/com/baeldung/java9/finalizers/Resource.java @@ -0,0 +1,25 @@ +package com.bealdung.java9.finalizers; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; + +class Resource implements AutoCloseable { + + final BufferedReader reader; + + public Resource(String filename) throws FileNotFoundException { + reader = new BufferedReader(new FileReader(filename)); + } + + public long getLineNumber() { + return reader.lines() + .count(); + } + + @Override + public void close() throws Exception { + reader.close(); + System.out.println("BufferedReader resource closed"); + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/finalizers/FinalizeUnitTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/finalizers/FinalizeUnitTest.java new file mode 100644 index 0000000000..3ef1fc1192 --- /dev/null +++ b/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/finalizers/FinalizeUnitTest.java @@ -0,0 +1,30 @@ +package com.bealdung.java9.finalizers; + +import org.junit.jupiter.api.Test; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class FinalizeUnitTest { + + @Test + void givenFilename_whenGetLineNumber_thenReturnCorrectNumber() throws IOException { + final File tmpFile = File.createTempFile("test", ".tmp"); + final BufferedWriter writer = new BufferedWriter(new FileWriter(tmpFile)); + writer.write("Baeldung"); + writer.close(); + + long lineNumber = 0; + try (Resource resource = new Resource(tmpFile.getAbsolutePath())) { + lineNumber = resource.getLineNumber(); + } catch (Exception e) { + System.err.println("Error " + e); + } + + assertEquals(1, lineNumber); + } +} 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"); + } } diff --git a/core-java-modules/core-java-collections-list-3/README.md b/core-java-modules/core-java-collections-list-3/README.md index 6d0a3c7037..ecae0dda7d 100644 --- a/core-java-modules/core-java-collections-list-3/README.md +++ b/core-java-modules/core-java-collections-list-3/README.md @@ -13,5 +13,4 @@ This module contains articles about the Java List collection - [Finding the Differences Between Two Lists in Java](https://www.baeldung.com/java-lists-difference) - [List vs. ArrayList in Java](https://www.baeldung.com/java-list-vs-arraylist) - [How to Store HashMap Inside a List](https://www.baeldung.com/java-hashmap-inside-list) -- [Working With a List of Lists in Java](https://www.baeldung.com/java-list-of-lists) - [[<-- Prev]](/core-java-modules/core-java-collections-list-2) diff --git a/core-java-modules/core-java-date-operations-2/pom.xml b/core-java-modules/core-java-date-operations-2/pom.xml index f60c7b7fc0..461ba70b62 100644 --- a/core-java-modules/core-java-date-operations-2/pom.xml +++ b/core-java-modules/core-java-date-operations-2/pom.xml @@ -30,11 +30,29 @@ hirondelle-date4j ${hirondelle-date4j.version} + + net.time4j + time4j-base + ${time4j-base.version} + + + net.time4j + time4j-sqlxml + ${time4j-sqlxml.version} + + + org.ocpsoft.prettytime + prettytime + ${prettytime.version} + 2.10 1.5.1 + 3.2.7.Final + 5.9 + 5.8 \ No newline at end of file diff --git a/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeAgoCalculator.java b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeAgoCalculator.java new file mode 100644 index 0000000000..e09880f1ee --- /dev/null +++ b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeAgoCalculator.java @@ -0,0 +1,94 @@ +package com.baeldung.timeago.version7; + +import java.util.Date; +import java.util.TimeZone; + +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.joda.time.Period; +import org.joda.time.format.PeriodFormat; +import org.joda.time.format.PeriodFormatter; +import org.joda.time.format.PeriodFormatterBuilder; + +public class TimeAgoCalculator { + + public static String calculateTimeAgoByTimeGranularity(Date pastTime, TimeGranularity granularity) { + Date currentTime = new Date(); + long timeDifferenceInMillis = currentTime.getTime() - pastTime.getTime(); + return timeDifferenceInMillis / granularity.toMillis() + " " + granularity.name() + .toLowerCase() + " ago"; + } + + public static String calculateHumanFriendlyTimeAgo(Date pastTime) { + Date currentTime = new Date(); + long timeDifferenceInMillis = currentTime.getTime() - pastTime.getTime(); + if (timeDifferenceInMillis / TimeGranularity.DECADES.toMillis() > 0) + return "several decades ago"; + else if (timeDifferenceInMillis / TimeGranularity.YEARS.toMillis() > 0) + return "several years ago"; + else if (timeDifferenceInMillis / TimeGranularity.MONTHS.toMillis() > 0) + return "several months ago"; + else if (timeDifferenceInMillis / TimeGranularity.WEEKS.toMillis() > 0) + return "several weeks ago"; + else if (timeDifferenceInMillis / TimeGranularity.DAYS.toMillis() > 0) + return "several days ago"; + else if (timeDifferenceInMillis / TimeGranularity.HOURS.toMillis() > 0) + return "several hours ago"; + else if (timeDifferenceInMillis / TimeGranularity.MINUTES.toMillis() > 0) + return "several minutes ago"; + else + return "moments ago"; + } + + public static String calculateExactTimeAgoWithJodaTime(Date pastTime) { + Period period = new Period(new DateTime(pastTime.getTime()), new DateTime()); + PeriodFormatter formatter = new PeriodFormatterBuilder().appendYears() + .appendSuffix(" year ", " years ") + .appendSeparator("and ") + .appendMonths() + .appendSuffix(" month ", " months ") + .appendSeparator("and ") + .appendWeeks() + .appendSuffix(" week ", " weeks ") + .appendSeparator("and ") + .appendDays() + .appendSuffix(" day ", " days ") + .appendSeparator("and ") + .appendHours() + .appendSuffix(" hour ", " hours ") + .appendSeparator("and ") + .appendMinutes() + .appendSuffix(" minute ", " minutes ") + .appendSeparator("and ") + .appendSeconds() + .appendSuffix(" second", " seconds") + .toFormatter(); + return formatter.print(period); + } + + public static String calculateHumanFriendlyTimeAgoWithJodaTime(Date pastTime) { + Period period = new Period(new DateTime(pastTime.getTime()), new DateTime()); + if (period.getYears() != 0) + return "several years ago"; + else if (period.getMonths() != 0) + return "several months ago"; + else if (period.getWeeks() != 0) + return "several weeks ago"; + else if (period.getDays() != 0) + return "several days ago"; + else if (period.getHours() != 0) + return "several hours ago"; + else if (period.getMinutes() != 0) + return "several minutes ago"; + else + return "moments ago"; + } + + public static String calculateZonedTimeAgoWithJodaTime(Date pastTime, TimeZone zone) { + DateTimeZone dateTimeZone = DateTimeZone.forID(zone.getID()); + Period period = new Period(new DateTime(pastTime.getTime(), dateTimeZone), new DateTime(dateTimeZone)); + return PeriodFormat.getDefault() + .print(period); + } + +} diff --git a/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeGranularity.java b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeGranularity.java new file mode 100644 index 0000000000..0cdb9729e2 --- /dev/null +++ b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeGranularity.java @@ -0,0 +1,41 @@ +package com.baeldung.timeago.version7; + +import java.util.concurrent.TimeUnit; + +public enum TimeGranularity { + SECONDS { + public long toMillis() { + return TimeUnit.SECONDS.toMillis(1); + } + }, MINUTES { + public long toMillis() { + return TimeUnit.MINUTES.toMillis(1); + } + }, HOURS { + public long toMillis() { + return TimeUnit.HOURS.toMillis(1); + } + }, DAYS { + public long toMillis() { + return TimeUnit.DAYS.toMillis(1); + } + }, WEEKS { + public long toMillis() { + return TimeUnit.DAYS.toMillis(7); + } + }, MONTHS { + public long toMillis() { + return TimeUnit.DAYS.toMillis(30); + } + }, YEARS { + public long toMillis() { + return TimeUnit.DAYS.toMillis(365); + } + }, DECADES { + public long toMillis() { + return TimeUnit.DAYS.toMillis(365 * 10); + } + }; + + public abstract long toMillis(); +} diff --git a/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version8/TimeAgoCalculator.java b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version8/TimeAgoCalculator.java new file mode 100644 index 0000000000..392cfa54fa --- /dev/null +++ b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version8/TimeAgoCalculator.java @@ -0,0 +1,44 @@ +package com.baeldung.timeago.version8; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.Period; +import java.time.ZoneId; +import java.util.Date; +import java.util.Locale; + +import org.ocpsoft.prettytime.PrettyTime; + +public class TimeAgoCalculator { + + public static String calculateTimeAgoWithPeriodAndDuration(LocalDateTime pastTime, ZoneId zone) { + Period period = Period.between(pastTime.toLocalDate(), LocalDate.now(zone)); + Duration duration = Duration.between(pastTime, LocalDateTime.now(zone)); + if (period.getYears() != 0) + return "several years ago"; + else if (period.getMonths() != 0) + return "several months ago"; + else if (period.getDays() != 0) + return "several days ago"; + else if (duration.toHours() != 0) + return "several hours ago"; + else if (duration.toMinutes() != 0) + return "several minutes ago"; + else if (duration.getSeconds() != 0) + return "several seconds ago"; + else + return "moments ago"; + } + + public static String calculateTimeAgoWithPrettyTime(Date pastTime) { + PrettyTime prettyTime = new PrettyTime(); + return prettyTime.format(pastTime); + } + + public static String calculateTimeAgoWithTime4J(Date pastTime, ZoneId zone, Locale locale) { + return net.time4j.PrettyTime.of(locale) + .printRelative(pastTime.toInstant(), zone); + } + +} 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 new file mode 100644 index 0000000000..b41533aa7e --- /dev/null +++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java @@ -0,0 +1,56 @@ +package com.baeldung.timeago.version7; + +import java.util.Date; + +import org.junit.Assert; +import org.junit.Test; + +public class TimeAgoCalculatorUnitTest { + + // 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)); + Assert.assertEquals("5 minutes ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 60 * 1000)), TimeGranularity.MINUTES)); + Assert.assertEquals("5 hours ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000)), TimeGranularity.HOURS)); + Assert.assertEquals("5 days ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)), TimeGranularity.DAYS)); + Assert.assertEquals("5 months ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)), TimeGranularity.MONTHS)); + Assert.assertEquals("5 weeks ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 7)), TimeGranularity.WEEKS)); + Assert.assertEquals("5 years ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)), TimeGranularity.YEARS)); + Assert.assertEquals("5 decades ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)), TimeGranularity.DECADES)); + } + + //@Test + public void humanFriendlyTimeAgoTest() { + long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; + Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 1000)))); + Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 60 * 1000)))); + Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000)))); + Assert.assertEquals("several days ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)))); + Assert.assertEquals("several months ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)))); + Assert.assertEquals("several weeks ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (3 * DAY_IN_MILLIS * 7)))); + Assert.assertEquals("several years ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)))); + Assert.assertEquals("several decades ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)))); + } + + //@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 + public void calculateHumanFriendlyTimeAgoWithJodaTimeTest() { + long DAY_IN_MILLIS = 1000 * 60 * 60 * 24; + Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 1000)))); + Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 1000)))); + Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000)))); + Assert.assertEquals("several days ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)))); + Assert.assertEquals("several months ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)))); + Assert.assertEquals("several weeks ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (3 * DAY_IN_MILLIS * 7)))); + Assert.assertEquals("several years ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)))); + } + +} 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 new file mode 100644 index 0000000000..5fb8512a7e --- /dev/null +++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java @@ -0,0 +1,24 @@ +package com.baeldung.timeago.version8; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; + +import org.junit.Assert; +import org.junit.Test; + +public class TimeAgoCalculatorUnitTest { + + // 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())); + Assert.assertEquals("several seconds ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault())); + Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 60 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault())); + Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 60 * 60 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault())); + Assert.assertEquals("several days ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)), ZoneId.systemDefault()), ZoneId.systemDefault())); + Assert.assertEquals("several months ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)), ZoneId.systemDefault()), ZoneId.systemDefault())); + Assert.assertEquals("several years ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)), ZoneId.systemDefault()), ZoneId.systemDefault())); + } +} diff --git a/core-java-modules/core-java-exceptions-2/README.md b/core-java-modules/core-java-exceptions-2/README.md index e6441c2c12..d37808b8d9 100644 --- a/core-java-modules/core-java-exceptions-2/README.md +++ b/core-java-modules/core-java-exceptions-2/README.md @@ -14,3 +14,5 @@ This module contains articles about core java exceptions - [How to Find an Exception’s Root Cause in Java](https://www.baeldung.com/java-exception-root-cause) - [Java IOException “Too many open files”](https://www.baeldung.com/java-too-many-open-files) - [When Does Java Throw the ExceptionInInitializerError?](https://www.baeldung.com/java-exceptionininitializererror) +- More articles: [[<-- prev]](../core-java-exceptions) [[next -->]](../core-java-exceptions-3) + diff --git a/core-java-modules/core-java-exceptions-3/README.md b/core-java-modules/core-java-exceptions-3/README.md index d269444ccb..5f46c337b8 100644 --- a/core-java-modules/core-java-exceptions-3/README.md +++ b/core-java-modules/core-java-exceptions-3/README.md @@ -1,5 +1,8 @@ -### Relevant Articles: +## Core Java Exceptions +This module contains articles about core java exceptions + +### Relevant Articles: - [NoSuchMethodError in Java](https://www.baeldung.com/java-nosuchmethod-error) - [IllegalArgumentException or NullPointerException for a Null Parameter?](https://www.baeldung.com/java-illegalargumentexception-or-nullpointerexception) - [IllegalMonitorStateException in Java](https://www.baeldung.com/java-illegalmonitorstateexception) @@ -10,3 +13,5 @@ - [NoSuchFieldError in Java](https://www.baeldung.com/java-nosuchfielderror) - [IllegalAccessError in Java](https://www.baeldung.com/java-illegalaccesserror) - [Working with (Unknown Source) Stack Traces in Java](https://www.baeldung.com/java-unknown-source-stack-trace) +- More articles: [[<-- prev]](../core-java-exceptions-2) [[next -->]](../core-java-exceptions-4) + diff --git a/core-java-modules/core-java-exceptions-4/README.md b/core-java-modules/core-java-exceptions-4/README.md index 7df8ef65b9..1ea95510e9 100644 --- a/core-java-modules/core-java-exceptions-4/README.md +++ b/core-java-modules/core-java-exceptions-4/README.md @@ -1,5 +1,10 @@ -### Relevant Articles: +## Core Java Exceptions +This module contains articles about core java exceptions + +### Relevant articles: - [Java ArrayIndexOutOfBoundsException](https://www.baeldung.com/java-arrayindexoutofboundsexception) - [Java Missing Return Statement](https://www.baeldung.com/java-missing-return-statement) - [Convert long to int Type in Java](https://www.baeldung.com/java-convert-long-to-int) +- [“Sneaky Throws” in Java](https://www.baeldung.com/java-sneaky-throws) +- [[<-- Prev]](../core-java-exceptions-3) \ No newline at end of file diff --git a/core-java-modules/core-java-exceptions-4/pom.xml b/core-java-modules/core-java-exceptions-4/pom.xml index e9a2d05180..e691e1446d 100644 --- a/core-java-modules/core-java-exceptions-4/pom.xml +++ b/core-java-modules/core-java-exceptions-4/pom.xml @@ -22,6 +22,12 @@ ${h2.version} test + + org.projectlombok + lombok + ${lombok.version} + provided + diff --git a/core-java-modules/core-java-exceptions-4/src/main/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamples.java b/core-java-modules/core-java-exceptions-4/src/main/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamples.java new file mode 100644 index 0000000000..dc868c867b --- /dev/null +++ b/core-java-modules/core-java-exceptions-4/src/main/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamples.java @@ -0,0 +1,22 @@ +package com.baeldung.exception.sneakythrows; + +import lombok.SneakyThrows; + +import java.io.IOException; + +public class SneakyThrowsExamples { + + public static void sneakyThrow(Throwable e) throws E { + throw (E) e; + } + + public static void throwSneakyIOException() { + sneakyThrow(new IOException("sneaky")); + } + + @SneakyThrows + public static void throwSneakyIOExceptionUsingLombok() { + throw new IOException("lombok sneaky"); + } + +} diff --git a/core-java-modules/core-java-exceptions-4/src/test/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamplesUnitTest.java b/core-java-modules/core-java-exceptions-4/src/test/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamplesUnitTest.java new file mode 100644 index 0000000000..3fe705d9d2 --- /dev/null +++ b/core-java-modules/core-java-exceptions-4/src/test/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamplesUnitTest.java @@ -0,0 +1,28 @@ +package com.baeldung.exception.sneakythrows; + +import org.junit.Test; + +import java.io.IOException; + +import static com.baeldung.exception.sneakythrows.SneakyThrowsExamples.throwSneakyIOException; +import static com.baeldung.exception.sneakythrows.SneakyThrowsExamples.throwSneakyIOExceptionUsingLombok; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class SneakyThrowsExamplesUnitTest { + + @Test + public void throwSneakyIOException_IOExceptionShouldBeThrown() { + assertThatThrownBy(() -> throwSneakyIOException()) + .isInstanceOf(IOException.class) + .hasMessage("sneaky") + .hasStackTraceContaining("SneakyThrowsExamples.throwSneakyIOException"); + } + + @Test + public void throwSneakyIOExceptionUsingLombok_IOExceptionShouldBeThrown() { + assertThatThrownBy(() -> throwSneakyIOExceptionUsingLombok()) + .isInstanceOf(IOException.class) + .hasMessage("lombok sneaky") + .hasStackTraceContaining("SneakyThrowsExamples.throwSneakyIOExceptionUsingLombok"); + } +} diff --git a/core-java-modules/core-java-exceptions/README.md b/core-java-modules/core-java-exceptions/README.md index b74ede51e8..1a8f3b3674 100644 --- a/core-java-modules/core-java-exceptions/README.md +++ b/core-java-modules/core-java-exceptions/README.md @@ -9,9 +9,9 @@ This module contains articles about core java exceptions - [Exception Handling in Java](https://www.baeldung.com/java-exceptions) - [Differences Between Final, Finally and Finalize in Java](https://www.baeldung.com/java-final-finally-finalize) - [Difference Between Throw and Throws in Java](https://www.baeldung.com/java-throw-throws) -- [“Sneaky Throws” in Java](https://www.baeldung.com/java-sneaky-throws) - [The StackOverflowError in Java](https://www.baeldung.com/java-stack-overflow-error) - [Checked and Unchecked Exceptions in Java](https://www.baeldung.com/java-checked-unchecked-exceptions) - [Common Java Exceptions](https://www.baeldung.com/java-common-exceptions) - [Will an Error Be Caught by Catch Block in Java?](https://www.baeldung.com/java-error-catch) -- [[Next -->]](/core-java-modules/core-java-exceptions-2) \ No newline at end of file +- [[Next -->]](../core-java-exceptions-2) +- \ No newline at end of file diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml index f1f60120a5..866248b416 100644 --- a/core-java-modules/core-java-exceptions/pom.xml +++ b/core-java-modules/core-java-exceptions/pom.xml @@ -21,12 +21,6 @@ mail ${javax.mail.version} - - org.projectlombok - lombok - ${lombok.version} - provided - org.apache.commons commons-lang3 diff --git a/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyRunnable.java b/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyRunnable.java deleted file mode 100644 index 06b587d0e0..0000000000 --- a/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyRunnable.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.baeldung.exceptions.sneakythrows; - -import lombok.SneakyThrows; - -public class SneakyRunnable implements Runnable { - - @SneakyThrows - public void run() { - try { - throw new InterruptedException(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - public static void main(String[] args) { - try { - new SneakyRunnable().run(); - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyThrows.java b/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyThrows.java deleted file mode 100644 index e86ef53733..0000000000 --- a/core-java-modules/core-java-exceptions/src/main/java/com/baeldung/exceptions/sneakythrows/SneakyThrows.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.exceptions.sneakythrows; - -import java.io.IOException; - -public class SneakyThrows { - - - public static void sneakyThrow(Throwable e) throws E { - throw (E) e; - } - - public static void throwsSneakyIOException() { - sneakyThrow(new IOException("sneaky")); - } - - - public static void main(String[] args) { - try { - throwsSneakyIOException(); - } catch (Exception ex) { - ex.printStackTrace(); - } - - } -} diff --git a/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyRunnableUnitTest.java b/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyRunnableUnitTest.java deleted file mode 100644 index 086c4eaef0..0000000000 --- a/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyRunnableUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.exceptions.sneakythrows; - -import org.junit.Test; - -import static junit.framework.TestCase.assertEquals; - -public class SneakyRunnableUnitTest { - - @Test - public void whenCallSneakyRunnableMethod_thenThrowException() { - try { - new SneakyRunnable().run(); - } catch (Exception e) { - assertEquals(InterruptedException.class, e.getStackTrace()); - } - } -} diff --git a/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyThrowsUnitTest.java b/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyThrowsUnitTest.java deleted file mode 100644 index 3b70128a9b..0000000000 --- a/core-java-modules/core-java-exceptions/src/test/java/com/baeldung/exceptions/sneakythrows/SneakyThrowsUnitTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baeldung.exceptions.sneakythrows; - -import org.junit.Test; - -import static junit.framework.TestCase.assertEquals; - -public class SneakyThrowsUnitTest { - - @Test - public void whenCallSneakyMethod_thenThrowSneakyException() { - try { - SneakyThrows.throwsSneakyIOException(); - } catch (Exception ex) { - assertEquals("sneaky", ex.getMessage().toString()); - } - } - -} diff --git a/core-java-modules/core-java-httpclient/README.md b/core-java-modules/core-java-httpclient/README.md index 712328a123..68f828e81b 100644 --- a/core-java-modules/core-java-httpclient/README.md +++ b/core-java-modules/core-java-httpclient/README.md @@ -4,3 +4,4 @@ This module contains articles about Java HttpClient ### Relevant articles - [Posting with Java HttpClient](https://www.baeldung.com/java-httpclient-post) +- [Custom HTTP Header With the Java HttpClient](https://www.baeldung.com/java-http-client-custom-header) diff --git a/core-java-modules/core-java-lang-operators-2/README.md b/core-java-modules/core-java-lang-operators-2/README.md index 480021108d..0cc0a77605 100644 --- a/core-java-modules/core-java-lang-operators-2/README.md +++ b/core-java-modules/core-java-lang-operators-2/README.md @@ -7,3 +7,4 @@ This module contains articles about Java operators - [Logical vs Bitwise OR Operator](https://www.baeldung.com/java-logical-vs-bitwise-or-operator) - [Bitmasking in Java with Bitwise Operators](https://www.baeldung.com/java-bitmasking) - [Getting a Bit at a Certain Position from Integral Values](https://www.baeldung.com/java-get-bit-at-position) +- [Check if at Least Two Out of Three Booleans Are True in Java](https://www.baeldung.com/java-check-two-of-three-booleans) diff --git a/core-java-modules/core-java-lang-operators-2/src/main/java/com/baeldung/threebool/ThreeBooleans.java b/core-java-modules/core-java-lang-operators-2/src/main/java/com/baeldung/threebool/ThreeBooleans.java new file mode 100644 index 0000000000..e76f08d8dc --- /dev/null +++ b/core-java-modules/core-java-lang-operators-2/src/main/java/com/baeldung/threebool/ThreeBooleans.java @@ -0,0 +1,45 @@ +package com.baeldung.threebool; + +import java.util.Arrays; + +public class ThreeBooleans { + public static boolean twoOrMoreAreTrueByLoop(boolean a, boolean b, boolean c) { + int count = 0; + for (boolean i : new Boolean[] { a, b, c }) { + count += i ? 1 : 0; + if (count >= 2) + return true; + } + return false; + } + + public static boolean xOrMoreAreTrueByLoop(boolean[] booleans, int x) { + int count = 0; + for (boolean i : booleans) { + count += i ? 1 : 0; + if (count >= x) + return true; + } + return false; + } + + public static boolean twoOrMoreAreTrueBySum(boolean a, boolean b, boolean c) { + return (a ? 1 : 0) + (b ? 1 : 0) + (c ? 1 : 0) >= 2; + } + + public static boolean xOrMoreAreTrueBySum(Boolean[] booleans, int x) { + return Arrays.stream(booleans).mapToInt(b -> Boolean.TRUE.equals(b) ? 1 : 0).sum() >= x; + } + + public static boolean twoorMoreAreTrueByKarnaughMap(boolean a, boolean b, boolean c) { + return (c && (a || b)) || (a && b); + } + + public static boolean twoOrMoreAreTrueByOperators(boolean a, boolean b, boolean c) { + return (a && b) || (a && c) || (b && c); + } + + public static boolean twoOrMoreAreTrueByXor(boolean a, boolean b, boolean c) { + return a ^ b ? c : a; + } +} diff --git a/core-java-modules/core-java-lang-operators-2/src/test/java/com/baeldung/threebool/ThreeBooleansUnitTest.java b/core-java-modules/core-java-lang-operators-2/src/test/java/com/baeldung/threebool/ThreeBooleansUnitTest.java new file mode 100644 index 0000000000..96bd49678d --- /dev/null +++ b/core-java-modules/core-java-lang-operators-2/src/test/java/com/baeldung/threebool/ThreeBooleansUnitTest.java @@ -0,0 +1,44 @@ +package com.baeldung.threebool; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.google.common.collect.ImmutableMap; +import java.util.Map; +import org.junit.jupiter.api.Test; + +class ThreeBooleansUnitTest { + // @formatter:off + private static final Map TEST_CASES_AND_EXPECTED = ImmutableMap.of( + new boolean[]{true, true, true}, true, + new boolean[]{true, true, false}, true, + new boolean[]{true, false, false}, false, + new boolean[]{false, false, false}, false + ); + // @formatter:on + + @Test + void given3Booleans_whenCallingTwoOrMoreAreTrueByLoop_thenGetExpectedResult() { + TEST_CASES_AND_EXPECTED.forEach((array, expected) -> assertThat(ThreeBooleans.twoOrMoreAreTrueByLoop(array[0], array[1], array[2])).isEqualTo(expected)); + } + + @Test + void given3Booleans_whenCallingTwoOrMoreAreTrueByCounting_thenGetExpectedResult() { + TEST_CASES_AND_EXPECTED.forEach((array, expected) -> assertThat(ThreeBooleans.twoOrMoreAreTrueBySum(array[0], array[1], array[2])).isEqualTo(expected)); + } + + @Test + void given3Booleans_whenCallingTwoOrMoreAreTrueByKarnaughMap_thenGetExpectedResult() { + TEST_CASES_AND_EXPECTED.forEach((array, expected) -> assertThat(ThreeBooleans.twoorMoreAreTrueByKarnaughMap(array[0], array[1], array[2])).isEqualTo(expected)); + } + + @Test + void given3Booleans_whenCallingTwoOrMoreAreTrueByOperators_thenGetExpectedResult() { + TEST_CASES_AND_EXPECTED.forEach((array, expected) -> assertThat(ThreeBooleans.twoOrMoreAreTrueByOperators(array[0], array[1], array[2])).isEqualTo(expected)); + } + + @Test + void given3Booleans_whenCallingTwoOrMoreAreTrueByXor_thenGetExpectedResult() { + TEST_CASES_AND_EXPECTED.forEach((array, expected) -> assertThat(ThreeBooleans.twoOrMoreAreTrueByXor(array[0], array[1], array[2])).isEqualTo(expected)); + } + +} diff --git a/core-java-modules/core-java-reflection-2/README.md b/core-java-modules/core-java-reflection-2/README.md index a3c9d00b0a..8613845d4f 100644 --- a/core-java-modules/core-java-reflection-2/README.md +++ b/core-java-modules/core-java-reflection-2/README.md @@ -8,3 +8,4 @@ - [Finding All Classes in a Java Package](https://www.baeldung.com/java-find-all-classes-in-package) - [Invoke a Static Method Using Java Reflection API](https://www.baeldung.com/java-invoke-static-method-reflection) - [What Is the JDK com.sun.proxy.$Proxy Class?](https://www.baeldung.com/jdk-com-sun-proxy) +- [Unit Test Private Methods in Java](https://www.baeldung.com/java-unit-test-private-methods) diff --git a/core-java-modules/core-java-reflection-2/pom.xml b/core-java-modules/core-java-reflection-2/pom.xml index 2cb6d722a8..ee3eeee734 100644 --- a/core-java-modules/core-java-reflection-2/pom.xml +++ b/core-java-modules/core-java-reflection-2/pom.xml @@ -47,6 +47,25 @@ -parameters + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + + prepare-agent + + + + report + prepare-package + + report + + + + diff --git a/core-java-modules/core-java-reflection-2/src/main/java/com/baeldung/reflection/privatemethods/Utils.java b/core-java-modules/core-java-reflection-2/src/main/java/com/baeldung/reflection/privatemethods/Utils.java new file mode 100644 index 0000000000..f3ff0b5cf5 --- /dev/null +++ b/core-java-modules/core-java-reflection-2/src/main/java/com/baeldung/reflection/privatemethods/Utils.java @@ -0,0 +1,19 @@ +package com.baeldung.reflection.privatemethods; + +public class Utils { + + public static Integer validateAndDouble(Integer input) { + if (input == null) { + throw new IllegalArgumentException("input should not be null"); + } + return doubleInteger(input); + } + + private static Integer doubleInteger(Integer input) { + if (input == null) { + return null; + } + return 2 * input; + } + +} diff --git a/core-java-modules/core-java-reflection-2/src/test/java/com/baeldung/reflection/privatemethods/UtilsUnitTest.java b/core-java-modules/core-java-reflection-2/src/test/java/com/baeldung/reflection/privatemethods/UtilsUnitTest.java new file mode 100644 index 0000000000..59fa98c7d4 --- /dev/null +++ b/core-java-modules/core-java-reflection-2/src/test/java/com/baeldung/reflection/privatemethods/UtilsUnitTest.java @@ -0,0 +1,42 @@ +package com.baeldung.reflection.privatemethods; + +import static com.baeldung.reflection.privatemethods.Utils.validateAndDouble; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.junit.jupiter.api.Test; + +public class UtilsUnitTest { + + // Let's start with the tests of the public API + @Test + void givenNull_WhenValidateAndDouble_ThenThrows() { + assertThrows(IllegalArgumentException.class, () -> validateAndDouble(null)); + } + + @Test + void givenANonNullInteger_WhenValidateAndDouble_ThenDoublesIt() { + assertEquals(4, validateAndDouble(2)); + } + + // Further on, let's test the private method + @Test + void givenNull_WhenDoubleInteger_ThenNull() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { + assertEquals(null, getDoubleIntegerMethod().invoke(null, new Integer[] { null })); + } + + @Test + void givenANonNullInteger_WhenDoubleInteger_ThenDoubleIt() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + assertEquals(74, getDoubleIntegerMethod().invoke(null, 37)); + } + + private Method getDoubleIntegerMethod() throws NoSuchMethodException { + Method method = Utils.class.getDeclaredMethod("doubleInteger", Integer.class); + method.setAccessible(true); + return method; + } + +} diff --git a/core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java b/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java similarity index 94% rename from core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java rename to core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java index d7b50d95ca..35d96077b3 100644 --- a/core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java +++ b/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java @@ -1,4 +1,4 @@ -package regex.array; +package com.baeldung.regex.array; import java.util.ArrayList; import java.util.List; diff --git a/core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java similarity index 90% rename from core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java rename to core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java index 3e8f23c4bb..fd41cb31ef 100644 --- a/core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java +++ b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java @@ -1,10 +1,9 @@ -package regex.array; +package com.baeldung.regex.array; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; -import regex.array.RegexMatches; - class RegexMatchesUnitTest { @Test diff --git a/core-java-modules/core-java-string-conversions-2/README.md b/core-java-modules/core-java-string-conversions-2/README.md index 7abcd5e97a..71f35c17b1 100644 --- a/core-java-modules/core-java-string-conversions-2/README.md +++ b/core-java-modules/core-java-string-conversions-2/README.md @@ -11,4 +11,5 @@ This module contains articles about string conversions from/to another type. - [Convert a String to Camel Case](https://www.baeldung.com/java-string-to-camel-case) - [Convert a ByteBuffer to String in Java](https://www.baeldung.com/java-bytebuffer-to-string) - [Convert String to Float and Back in Java](https://www.baeldung.com/java-string-to-float) -- More articles: [[<-- prev]](/core-java-string-conversions) +- [Difference Between parseInt() and valueOf() in Java](https://www.baeldung.com/java-integer-parseint-vs-valueof) +- More articles: [[<-- prev]](/core-java-modules/core-java-string-conversions) diff --git a/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtointeger/StringToIntegerUnitTest.java b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtointeger/StringToIntegerUnitTest.java new file mode 100644 index 0000000000..dbb32e3f1b --- /dev/null +++ b/core-java-modules/core-java-string-conversions-2/src/test/java/com/baeldung/stringtointeger/StringToIntegerUnitTest.java @@ -0,0 +1,73 @@ +package com.baeldung.stringtointeger; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class StringToIntegerUnitTest { + + @Test + public void whenValidNumericStringIsPassed_thenShouldConvertToPrimitiveInt() { + assertEquals(11, Integer.parseInt("11")); + assertEquals(11, Integer.parseInt("+11")); + assertEquals(-11, Integer.parseInt("-11")); + } + + @Test + public void whenValidNumericStringWithRadixIsPassed_thenShouldConvertToPrimitiveInt() { + assertEquals(17, Integer.parseInt("11", 16)); + assertEquals(10, Integer.parseInt("A", 16)); + assertEquals(7, Integer.parseInt("7", 8)); + } + +// public static int parseInt(CharSequence s, int beginIndex, int endIndex, int radix) throws NumberFormatException +// This method is available in JDK 9 and above +// @Test +// public void whenValidNumericStringWithRadixAndSubstringIsPassed_thenShouldConvertToPrimitiveInt() { +// assertEquals(5, Integer.parseInt("100101", 3, 6, 2)); +// assertEquals(101, Integer.parseInt("100101", 3, 6, 10)); +// } + + @Test(expected = NumberFormatException.class) + public void whenInValidNumericStringIsPassed_thenShouldThrowNumberFormatException() { + int number = Integer.parseInt("abcd"); + } + + @Test + public void whenValidNumericStringIsPassed_thenShouldConvertToInteger() { + Integer expectedNumber = 11; + Integer expectedNegativeNumber = -11; + + assertEquals(expectedNumber, Integer.valueOf("11")); + assertEquals(expectedNumber, Integer.valueOf("+11")); + assertEquals(expectedNegativeNumber, Integer.valueOf("-11")); + } + + @Test + public void whenNumberIsPassed_thenShouldConvertToInteger() { + Integer expectedNumber = 11; + Integer expectedNegativeNumber = -11; + Integer expectedUnicodeValue = 65; + + assertEquals(expectedNumber, Integer.valueOf(11)); + assertEquals(expectedNumber, Integer.valueOf(+11)); + assertEquals(expectedNegativeNumber, Integer.valueOf(-11)); + assertEquals(expectedUnicodeValue, Integer.valueOf('A')); + } + + @Test + public void whenValidNumericStringWithRadixIsPassed_thenShouldConvertToInetger() { + Integer expectedNumber1 = 17; + Integer expectedNumber2 = 10; + Integer expectedNumber3 = 7; + + assertEquals(expectedNumber1, Integer.valueOf("11", 16)); + assertEquals(expectedNumber2, Integer.valueOf("A", 16)); + assertEquals(expectedNumber3, Integer.valueOf("7", 8)); + } + + @Test(expected = NumberFormatException.class) + public void whenInvalidValueOfNumericStringPassed_thenShouldThrowException() { + Integer number = Integer.valueOf("abcd"); + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-string-conversions/README.md b/core-java-modules/core-java-string-conversions/README.md index a86062e4d4..ab631cd063 100644 --- a/core-java-modules/core-java-string-conversions/README.md +++ b/core-java-modules/core-java-string-conversions/README.md @@ -13,4 +13,4 @@ This module contains articles about string conversions from/to another type. - [Convert String to Double in Java](https://www.baeldung.com/java-string-to-double) - [Convert Char to String in Java](https://www.baeldung.com/java-convert-char-to-string) - [Convert String to int or Integer in Java](https://www.baeldung.com/java-convert-string-to-int-or-integer) -- More articles: [[next -->]](/core-java-string-conversions-2) +- More articles: [[next -->]](/core-java-modules/core-java-string-conversions-2) diff --git a/java-numbers-2/README.md b/core-java-modules/java-numbers-2/README.md similarity index 92% rename from java-numbers-2/README.md rename to core-java-modules/java-numbers-2/README.md index 1d996e32cc..1a680183be 100644 --- a/java-numbers-2/README.md +++ b/core-java-modules/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]](../java-numbers) [[next -->]](../java-numbers-3) diff --git a/java-numbers-2/pom.xml b/core-java-modules/java-numbers-2/pom.xml similarity index 89% rename from java-numbers-2/pom.xml rename to core-java-modules/java-numbers-2/pom.xml index 466d040b13..b41348e375 100644 --- a/java-numbers-2/pom.xml +++ b/core-java-modules/java-numbers-2/pom.xml @@ -9,10 +9,9 @@ jar - com.baeldung - parent-java + com.baeldung.core-java-modules + core-java-modules 0.0.1-SNAPSHOT - ../parent-java diff --git a/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java diff --git a/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java diff --git a/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java diff --git a/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java diff --git a/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java diff --git a/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java diff --git a/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java diff --git a/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java similarity index 96% rename from java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java index 62cead726f..07d846df4a 100644 --- a/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java +++ b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java @@ -1,140 +1,140 @@ -package com.baeldung.binarynumbers; - -public class BinaryNumbers { - - /** - * This method takes a decimal number and convert it into a binary number. - * example:- input:10, output:1010 - * - * @param decimalNumber - * @return binary number - */ - public Integer convertDecimalToBinary(Integer decimalNumber) { - - if (decimalNumber == 0) { - return decimalNumber; - } - - StringBuilder binaryNumber = new StringBuilder(); - Integer quotient = decimalNumber; - - while (quotient > 0) { - - int remainder = quotient % 2; - binaryNumber.append(remainder); - quotient /= 2; - } - - binaryNumber = binaryNumber.reverse(); - return Integer.valueOf(binaryNumber.toString()); - } - - /** - * This method takes a binary number and convert it into a decimal number. - * example:- input:101, output:5 - * - * @param binary number - * @return decimal Number - */ - public Integer convertBinaryToDecimal(Integer binaryNumber) { - - Integer decimalNumber = 0; - Integer base = 1; - - while (binaryNumber > 0) { - - int lastDigit = binaryNumber % 10; - binaryNumber = binaryNumber / 10; - - decimalNumber += lastDigit * base; - base = base * 2; - } - return decimalNumber; - } - - /** - * This method accepts two binary numbers and returns sum of input numbers. - * Example:- firstNum: 101, secondNum: 100, output: 1001 - * - * @param firstNum - * @param secondNum - * @return addition of input numbers - */ - public Integer addBinaryNumber(Integer firstNum, Integer secondNum) { - - StringBuilder output = new StringBuilder(); - - int carry = 0; - int temp; - - while (firstNum != 0 || secondNum != 0) { - - temp = (firstNum % 10 + secondNum % 10 + carry) % 2; - output.append(temp); - - carry = (firstNum % 10 + secondNum % 10 + carry) / 2; - - firstNum = firstNum / 10; - secondNum = secondNum / 10; - } - - if (carry != 0) { - output.append(carry); - } - - return Integer.valueOf(output.reverse() - .toString()); - } - - /** - * This method takes two binary number as input and subtract second number from the first number. - * example:- firstNum: 1000, secondNum: 11, output: 101 - * @param firstNum - * @param secondNum - * @return Result of subtraction of secondNum from first - */ - public Integer substractBinaryNumber(Integer firstNum, Integer secondNum) { - - int onesComplement = Integer.valueOf(getOnesComplement(secondNum)); - StringBuilder output = new StringBuilder(); - int carry = 0; - int temp; - - while (firstNum != 0 || onesComplement != 0) { - - temp = (firstNum % 10 + onesComplement % 10 + carry) % 2; - output.append(temp); - - carry = (firstNum % 10 + onesComplement % 10 + carry) / 2; - - firstNum = firstNum / 10; - onesComplement = onesComplement / 10; - } - - String additionOfFirstNumAndOnesComplement = output.reverse() - .toString(); - - if (carry == 1) { - return addBinaryNumber(Integer.valueOf(additionOfFirstNumAndOnesComplement), carry); - } else { - return getOnesComplement(Integer.valueOf(additionOfFirstNumAndOnesComplement)); - } - } - - public Integer getOnesComplement(Integer num) { - - StringBuilder onesComplement = new StringBuilder(); - while (num > 0) { - int lastDigit = num % 10; - if (lastDigit == 0) { - onesComplement.append(1); - } else { - onesComplement.append(0); - } - num = num / 10; - } - return Integer.valueOf(onesComplement.reverse() - .toString()); - } - +package com.baeldung.binarynumbers; + +public class BinaryNumbers { + + /** + * This method takes a decimal number and convert it into a binary number. + * example:- input:10, output:1010 + * + * @param decimalNumber + * @return binary number + */ + public Integer convertDecimalToBinary(Integer decimalNumber) { + + if (decimalNumber == 0) { + return decimalNumber; + } + + StringBuilder binaryNumber = new StringBuilder(); + Integer quotient = decimalNumber; + + while (quotient > 0) { + + int remainder = quotient % 2; + binaryNumber.append(remainder); + quotient /= 2; + } + + binaryNumber = binaryNumber.reverse(); + return Integer.valueOf(binaryNumber.toString()); + } + + /** + * This method takes a binary number and convert it into a decimal number. + * example:- input:101, output:5 + * + * @param binary number + * @return decimal Number + */ + public Integer convertBinaryToDecimal(Integer binaryNumber) { + + Integer decimalNumber = 0; + Integer base = 1; + + while (binaryNumber > 0) { + + int lastDigit = binaryNumber % 10; + binaryNumber = binaryNumber / 10; + + decimalNumber += lastDigit * base; + base = base * 2; + } + return decimalNumber; + } + + /** + * This method accepts two binary numbers and returns sum of input numbers. + * Example:- firstNum: 101, secondNum: 100, output: 1001 + * + * @param firstNum + * @param secondNum + * @return addition of input numbers + */ + public Integer addBinaryNumber(Integer firstNum, Integer secondNum) { + + StringBuilder output = new StringBuilder(); + + int carry = 0; + int temp; + + while (firstNum != 0 || secondNum != 0) { + + temp = (firstNum % 10 + secondNum % 10 + carry) % 2; + output.append(temp); + + carry = (firstNum % 10 + secondNum % 10 + carry) / 2; + + firstNum = firstNum / 10; + secondNum = secondNum / 10; + } + + if (carry != 0) { + output.append(carry); + } + + return Integer.valueOf(output.reverse() + .toString()); + } + + /** + * This method takes two binary number as input and subtract second number from the first number. + * example:- firstNum: 1000, secondNum: 11, output: 101 + * @param firstNum + * @param secondNum + * @return Result of subtraction of secondNum from first + */ + public Integer substractBinaryNumber(Integer firstNum, Integer secondNum) { + + int onesComplement = Integer.valueOf(getOnesComplement(secondNum)); + StringBuilder output = new StringBuilder(); + int carry = 0; + int temp; + + while (firstNum != 0 || onesComplement != 0) { + + temp = (firstNum % 10 + onesComplement % 10 + carry) % 2; + output.append(temp); + + carry = (firstNum % 10 + onesComplement % 10 + carry) / 2; + + firstNum = firstNum / 10; + onesComplement = onesComplement / 10; + } + + String additionOfFirstNumAndOnesComplement = output.reverse() + .toString(); + + if (carry == 1) { + return addBinaryNumber(Integer.valueOf(additionOfFirstNumAndOnesComplement), carry); + } else { + return getOnesComplement(Integer.valueOf(additionOfFirstNumAndOnesComplement)); + } + } + + public Integer getOnesComplement(Integer num) { + + StringBuilder onesComplement = new StringBuilder(); + while (num > 0) { + int lastDigit = num % 10; + if (lastDigit == 0) { + onesComplement.append(1); + } else { + onesComplement.append(0); + } + num = num / 10; + } + return Integer.valueOf(onesComplement.reverse() + .toString()); + } + } \ No newline at end of file diff --git a/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java diff --git a/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java diff --git a/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java diff --git a/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java diff --git a/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java diff --git a/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java diff --git a/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java b/core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java similarity index 100% rename from java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java rename to core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java diff --git a/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java similarity index 96% rename from java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java index ca6022261d..794f58a0a2 100644 --- a/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java +++ b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java @@ -1,73 +1,73 @@ -package com.baeldung.binarynumbers; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class BinaryNumbersUnitTest { - - private BinaryNumbers binaryNumbers = new BinaryNumbers(); - - @Test - public void given_decimalNumber_then_returnBinaryNumber() { - assertEquals(Integer.valueOf(1000), binaryNumbers.convertDecimalToBinary(8)); - assertEquals(Integer.valueOf(10100), binaryNumbers.convertDecimalToBinary(20)); - } - - @Test - public void given_decimalNumber_then_convertToBinaryNumber() { - assertEquals("1000", Integer.toBinaryString(8)); - assertEquals("10100", Integer.toBinaryString(20)); - } - - @Test - public void given_binaryNumber_then_ConvertToDecimalNumber() { - assertEquals(8, Integer.parseInt("1000", 2)); - assertEquals(20, Integer.parseInt("10100", 2)); - } - - @Test - public void given_binaryNumber_then_returnDecimalNumber() { - assertEquals(Integer.valueOf(8), binaryNumbers.convertBinaryToDecimal(1000)); - assertEquals(Integer.valueOf(20), binaryNumbers.convertBinaryToDecimal(10100)); - } - - @Test - public void given_twoBinaryNumber_then_returnAddition() { - // adding 4 and 10 - assertEquals(Integer.valueOf(1110), binaryNumbers.addBinaryNumber(100, 1010)); - - // adding 26 and 14 - assertEquals(Integer.valueOf(101000), binaryNumbers.addBinaryNumber(11010, 1110)); - } - - @Test - public void given_twoBinaryNumber_then_returnSubtraction() { - // subtracting 16 from 25 - assertEquals(Integer.valueOf(1001), binaryNumbers.substractBinaryNumber(11001, 10000)); - - // subtracting 29 from 16, the output here is negative - assertEquals(Integer.valueOf(1101), binaryNumbers.substractBinaryNumber(10000, 11101)); - } - - @Test - public void given_binaryLiteral_thenReturnDecimalValue() { - - byte five = 0b101; - assertEquals((byte) 5, five); - - short three = 0b11; - assertEquals((short) 3, three); - - int nine = 0B1001; - assertEquals(9, nine); - - long twentyNine = 0B11101; - assertEquals(29, twentyNine); - - int minusThirtySeven = -0B100101; - assertEquals(-37, minusThirtySeven); - - } - -} +package com.baeldung.binarynumbers; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class BinaryNumbersUnitTest { + + private BinaryNumbers binaryNumbers = new BinaryNumbers(); + + @Test + public void given_decimalNumber_then_returnBinaryNumber() { + assertEquals(Integer.valueOf(1000), binaryNumbers.convertDecimalToBinary(8)); + assertEquals(Integer.valueOf(10100), binaryNumbers.convertDecimalToBinary(20)); + } + + @Test + public void given_decimalNumber_then_convertToBinaryNumber() { + assertEquals("1000", Integer.toBinaryString(8)); + assertEquals("10100", Integer.toBinaryString(20)); + } + + @Test + public void given_binaryNumber_then_ConvertToDecimalNumber() { + assertEquals(8, Integer.parseInt("1000", 2)); + assertEquals(20, Integer.parseInt("10100", 2)); + } + + @Test + public void given_binaryNumber_then_returnDecimalNumber() { + assertEquals(Integer.valueOf(8), binaryNumbers.convertBinaryToDecimal(1000)); + assertEquals(Integer.valueOf(20), binaryNumbers.convertBinaryToDecimal(10100)); + } + + @Test + public void given_twoBinaryNumber_then_returnAddition() { + // adding 4 and 10 + assertEquals(Integer.valueOf(1110), binaryNumbers.addBinaryNumber(100, 1010)); + + // adding 26 and 14 + assertEquals(Integer.valueOf(101000), binaryNumbers.addBinaryNumber(11010, 1110)); + } + + @Test + public void given_twoBinaryNumber_then_returnSubtraction() { + // subtracting 16 from 25 + assertEquals(Integer.valueOf(1001), binaryNumbers.substractBinaryNumber(11001, 10000)); + + // subtracting 29 from 16, the output here is negative + assertEquals(Integer.valueOf(1101), binaryNumbers.substractBinaryNumber(10000, 11101)); + } + + @Test + public void given_binaryLiteral_thenReturnDecimalValue() { + + byte five = 0b101; + assertEquals((byte) 5, five); + + short three = 0b11; + assertEquals((short) 3, three); + + int nine = 0B1001; + assertEquals(9, nine); + + long twentyNine = 0B11101; + assertEquals(29, twentyNine); + + int minusThirtySeven = -0B100101; + assertEquals(-37, minusThirtySeven); + + } + +} diff --git a/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java diff --git a/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java b/core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java similarity index 100% rename from java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java rename to core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java diff --git a/java-numbers-3/README.md b/core-java-modules/java-numbers-3/README.md similarity index 93% rename from java-numbers-3/README.md rename to core-java-modules/java-numbers-3/README.md index 2cec5d52cd..c588b46d9b 100644 --- a/java-numbers-3/README.md +++ b/core-java-modules/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) +- More articles: [[<-- prev]](../java-numbers-2) [[next -->]](../java-numbers-4) diff --git a/java-numbers-3/pom.xml b/core-java-modules/java-numbers-3/pom.xml similarity index 90% rename from java-numbers-3/pom.xml rename to core-java-modules/java-numbers-3/pom.xml index 68c2ac98de..2c2006e303 100644 --- a/java-numbers-3/pom.xml +++ b/core-java-modules/java-numbers-3/pom.xml @@ -7,10 +7,9 @@ jar - com.baeldung - parent-java + com.baeldung.core-java-modules + core-java-modules 0.0.1-SNAPSHOT - ../parent-java diff --git a/java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/fibonacci/FibonacciSeriesUtils.java diff --git a/java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/formatNumber/FormatNumber.java diff --git a/java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/integerToBinary/IntegerToBinary.java diff --git a/java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/NumbersInARange.java diff --git a/java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/numbersinrange/RandomNumbersInARange.java diff --git a/java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java b/core-java-modules/java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java similarity index 100% rename from java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java rename to core-java-modules/java-numbers-3/src/main/java/com/baeldung/randomnumbers/RandomNumbersGenerator.java diff --git a/java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/abstractnumber/AbstractNumberUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/divisionbyzero/DivisionByZeroUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/doubletolong/DoubleToLongUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/fibonacci/FibonacciSeriesUtilsUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/NumbersInARangeUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/numbersinrange/RandomNumbersInARangeUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/parsedouble/StringToDoubleParserUnitTest.java diff --git a/java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java b/core-java-modules/java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java similarity index 100% rename from java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java rename to core-java-modules/java-numbers-3/src/test/java/com/baeldung/randomnumbers/RandomNumbersGeneratorUnitTest.java diff --git a/java-numbers-4/README.md b/core-java-modules/java-numbers-4/README.md similarity index 94% rename from java-numbers-4/README.md rename to core-java-modules/java-numbers-4/README.md index 12f9890ee3..2a7578dbb0 100644 --- a/java-numbers-4/README.md +++ b/core-java-modules/java-numbers-4/README.md @@ -10,3 +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 diff --git a/java-numbers-4/pom.xml b/core-java-modules/java-numbers-4/pom.xml similarity index 90% rename from java-numbers-4/pom.xml rename to core-java-modules/java-numbers-4/pom.xml index 4750b58511..b3ecb3be42 100644 --- a/java-numbers-4/pom.xml +++ b/core-java-modules/java-numbers-4/pom.xml @@ -7,10 +7,9 @@ jar - com.baeldung - parent-java + com.baeldung.core-java-modules + core-java-modules 0.0.1-SNAPSHOT - ../parent-java diff --git a/java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/automorphicnumber/AutomorphicNumber.java diff --git a/java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/booleantoint/BooleanToInt.java diff --git a/java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/convertLongToInt/ConvertLongToInt.java diff --git a/java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/humanreadablebytes/FileSizeFormatUtil.java diff --git a/java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/number_0xff/Number0xff.java diff --git a/java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/perfectsquare/PerfectSquareUtil.java diff --git a/java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/MaleHeightGenerator.java diff --git a/java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/probability/RandomInvoker.java diff --git a/java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java b/core-java-modules/java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java similarity index 100% rename from java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java rename to core-java-modules/java-numbers-4/src/main/java/com/baeldung/reversenumber/ReverseNumber.java diff --git a/java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/automorphicnumber/AutomorphicNumberUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/bigdecimalzero/BigDecimalZeroChkUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/biginteger/BigIntegerUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/booleantoint/BooleanToIntUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/convertLongToInt/ConvertLongToIntUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/humanreadablebytes/FileSizeFormatUtilUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/number_0xff/Number0xffUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/perfectsquare/PerfectSquareUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/probability/RandomInvokerUnitTest.java diff --git a/java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java b/core-java-modules/java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java similarity index 100% rename from java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java rename to core-java-modules/java-numbers-4/src/test/java/com/baeldung/reversenumber/ReverseNumberUnitTest.java diff --git a/java-numbers/.gitignore b/core-java-modules/java-numbers/.gitignore similarity index 100% rename from java-numbers/.gitignore rename to core-java-modules/java-numbers/.gitignore diff --git a/java-numbers/README.md b/core-java-modules/java-numbers/README.md similarity index 95% rename from java-numbers/README.md rename to core-java-modules/java-numbers/README.md index 3007e1746c..772d09869e 100644 --- a/java-numbers/README.md +++ b/core-java-modules/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 -->]](../java-numbers-2) diff --git a/java-numbers/pom.xml b/core-java-modules/java-numbers/pom.xml similarity index 90% rename from java-numbers/pom.xml rename to core-java-modules/java-numbers/pom.xml index c06bc48c5d..9bd0f33a85 100644 --- a/java-numbers/pom.xml +++ b/core-java-modules/java-numbers/pom.xml @@ -9,10 +9,9 @@ jar - com.baeldung - parent-java + com.baeldung.core-java-modules + core-java-modules 0.0.1-SNAPSHOT - ../parent-java diff --git a/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java diff --git a/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java similarity index 96% rename from java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java index 4163adcf09..aa1aa57339 100644 --- a/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java +++ b/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java @@ -1,51 +1,51 @@ -package com.baeldung.maths; - -import java.math.BigDecimal; - -public class FloatingPointArithmetic { - public static void main(String[] args) { - - double a = 13.22; - double b = 4.88; - double c = 21.45; - - System.out.println("a = " + a); - System.out.println("b = " + b); - System.out.println("c = " + c); - - double sum_ab = a + b; - System.out.println("a + b = " + sum_ab); - - double abc = a + b + c; - System.out.println("a + b + c = " + abc); - - double ab_c = sum_ab + c; - System.out.println("ab + c = " + ab_c); - - double sum_ac = a + c; - System.out.println("a + c = " + sum_ac); - - double acb = a + c + b; - System.out.println("a + c + b = " + acb); - - double ac_b = sum_ac + b; - System.out.println("ac + b = " + ac_b); - - double ab = 18.1; - double ac = 34.67; - double sum_ab_c = ab + c; - double sum_ac_b = ac + b; - System.out.println("ab + c = " + sum_ab_c); - System.out.println("ac + b = " + sum_ac_b); - - BigDecimal d = new BigDecimal(String.valueOf(a)); - BigDecimal e = new BigDecimal(String.valueOf(b)); - BigDecimal f = new BigDecimal(String.valueOf(c)); - - BigDecimal def = d.add(e).add(f); - BigDecimal dfe = d.add(f).add(e); - - System.out.println("d + e + f = " + def); - System.out.println("d + f + e = " + dfe); - } -} +package com.baeldung.maths; + +import java.math.BigDecimal; + +public class FloatingPointArithmetic { + public static void main(String[] args) { + + double a = 13.22; + double b = 4.88; + double c = 21.45; + + System.out.println("a = " + a); + System.out.println("b = " + b); + System.out.println("c = " + c); + + double sum_ab = a + b; + System.out.println("a + b = " + sum_ab); + + double abc = a + b + c; + System.out.println("a + b + c = " + abc); + + double ab_c = sum_ab + c; + System.out.println("ab + c = " + ab_c); + + double sum_ac = a + c; + System.out.println("a + c = " + sum_ac); + + double acb = a + c + b; + System.out.println("a + c + b = " + acb); + + double ac_b = sum_ac + b; + System.out.println("ac + b = " + ac_b); + + double ab = 18.1; + double ac = 34.67; + double sum_ab_c = ab + c; + double sum_ac_b = ac + b; + System.out.println("ab + c = " + sum_ab_c); + System.out.println("ac + b = " + sum_ac_b); + + BigDecimal d = new BigDecimal(String.valueOf(a)); + BigDecimal e = new BigDecimal(String.valueOf(b)); + BigDecimal f = new BigDecimal(String.valueOf(c)); + + BigDecimal def = d.add(e).add(f); + BigDecimal dfe = d.add(f).add(e); + + System.out.println("d + e + f = " + def); + System.out.println("d + f + e = " + dfe); + } +} diff --git a/java-numbers/src/main/java/com/baeldung/maths/Round.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/maths/Round.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java diff --git a/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java diff --git a/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java diff --git a/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java old mode 100755 new mode 100644 similarity index 97% rename from java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java index 737654ccf5..b12e6141f7 --- a/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java +++ b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java @@ -1,67 +1,67 @@ -package com.baeldung.numberofdigits; - -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.runner.RunnerException; - -public class Benchmarking { - public static void main(String[] args) throws RunnerException, IOException { - org.openjdk.jmh.Main.main(args); - } - - @State(Scope.Thread) - public static class ExecutionPlan { - public int number = Integer.MAX_VALUE; - public int length = 0; - public NumberOfDigits numberOfDigits= new NumberOfDigits(); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void stringBasedSolution(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.stringBasedSolution(plan.number); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void logarithmicApproach(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.logarithmicApproach(plan.number); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void repeatedMultiplication(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.repeatedMultiplication(plan.number); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void shiftOperators(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.shiftOperators(plan.number); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void dividingWithPowersOf2(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.dividingWithPowersOf2(plan.number); - } - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - @OutputTimeUnit(TimeUnit.NANOSECONDS) - public void divideAndConquer(ExecutionPlan plan) { - plan.length = plan.numberOfDigits.divideAndConquer(plan.number); - } -} +package com.baeldung.numberofdigits; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.runner.RunnerException; + +public class Benchmarking { + public static void main(String[] args) throws RunnerException, IOException { + org.openjdk.jmh.Main.main(args); + } + + @State(Scope.Thread) + public static class ExecutionPlan { + public int number = Integer.MAX_VALUE; + public int length = 0; + public NumberOfDigits numberOfDigits= new NumberOfDigits(); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void stringBasedSolution(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.stringBasedSolution(plan.number); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void logarithmicApproach(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.logarithmicApproach(plan.number); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void repeatedMultiplication(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.repeatedMultiplication(plan.number); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void shiftOperators(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.shiftOperators(plan.number); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void dividingWithPowersOf2(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.dividingWithPowersOf2(plan.number); + } + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + public void divideAndConquer(ExecutionPlan plan) { + plan.length = plan.numberOfDigits.divideAndConquer(plan.number); + } +} diff --git a/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java old mode 100755 new mode 100644 similarity index 96% rename from java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java index 1abf74d405..80f6b6c5c5 --- a/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java +++ b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java @@ -1,97 +1,97 @@ -package com.baeldung.numberofdigits; - -public class NumberOfDigits { - public int stringBasedSolution(int number) { - int length = String.valueOf(number).length(); - return length; - } - - public int logarithmicApproach(int number) { - int length = (int) Math.log10(number) + 1; - return length; - } - - public int repeatedMultiplication(int number) { - int length = 0; - long temp = 1; - while(temp <= number) { - length++; - temp *= 10; - } - return length; - } - - public int shiftOperators(int number) { - int length = 0; - long temp = 1; - while(temp <= number) { - length++; - temp = (temp << 3) + (temp << 1); - } - return length; - } - - public int dividingWithPowersOf2(int number) { - int length = 1; - if (number >= 100000000) { - length += 8; - number /= 100000000; - } - if (number >= 10000) { - length += 4; - number /= 10000; - } - if (number >= 100) { - length += 2; - number /= 100; - } - if (number >= 10) { - length += 1; - } - return length; - } - - public int divideAndConquer(int number) { - if (number < 100000){ - // 5 digits or less - if (number < 100){ - // 1 or 2 - if (number < 10) - return 1; - else - return 2; - }else{ - // 3 to 5 digits - if (number < 1000) - return 3; - else{ - // 4 or 5 digits - if (number < 10000) - return 4; - else - return 5; - } - } - } else { - // 6 digits or more - if (number < 10000000) { - // 6 or 7 digits - if (number < 1000000) - return 6; - else - return 7; - } else { - // 8 to 10 digits - if (number < 100000000) - return 8; - else { - // 9 or 10 digits - if (number < 1000000000) - return 9; - else - return 10; - } - } - } - } -} +package com.baeldung.numberofdigits; + +public class NumberOfDigits { + public int stringBasedSolution(int number) { + int length = String.valueOf(number).length(); + return length; + } + + public int logarithmicApproach(int number) { + int length = (int) Math.log10(number) + 1; + return length; + } + + public int repeatedMultiplication(int number) { + int length = 0; + long temp = 1; + while(temp <= number) { + length++; + temp *= 10; + } + return length; + } + + public int shiftOperators(int number) { + int length = 0; + long temp = 1; + while(temp <= number) { + length++; + temp = (temp << 3) + (temp << 1); + } + return length; + } + + public int dividingWithPowersOf2(int number) { + int length = 1; + if (number >= 100000000) { + length += 8; + number /= 100000000; + } + if (number >= 10000) { + length += 4; + number /= 10000; + } + if (number >= 100) { + length += 2; + number /= 100; + } + if (number >= 10) { + length += 1; + } + return length; + } + + public int divideAndConquer(int number) { + if (number < 100000){ + // 5 digits or less + if (number < 100){ + // 1 or 2 + if (number < 10) + return 1; + else + return 2; + }else{ + // 3 to 5 digits + if (number < 1000) + return 3; + else{ + // 4 or 5 digits + if (number < 10000) + return 4; + else + return 5; + } + } + } else { + // 6 digits or more + if (number < 10000000) { + // 6 or 7 digits + if (number < 1000000) + return 6; + else + return 7; + } else { + // 8 to 10 digits + if (number < 100000000) + return 8; + else { + // 9 or 10 digits + if (number < 1000000000) + return 9; + else + return 10; + } + } + } + } +} diff --git a/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java old mode 100755 new mode 100644 similarity index 96% rename from java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java index 4f98992e98..bdb1693724 --- a/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java +++ b/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java @@ -1,35 +1,35 @@ -package com.baeldung.numberofdigits; - -import org.apache.log4j.Logger; - -public class NumberOfDigitsDriver { - private static NumberOfDigits numberOfDigits; - - private static Logger LOG = Logger.getLogger(NumberOfDigitsDriver.class); - - static { - numberOfDigits = new NumberOfDigits(); - } - - public static void main(String[] args) { - LOG.info("Testing all methods..."); - - long length = numberOfDigits.stringBasedSolution(602); - LOG.info("String Based Solution : " + length); - - length = numberOfDigits.logarithmicApproach(602); - LOG.info("Logarithmic Approach : " + length); - - length = numberOfDigits.repeatedMultiplication(602); - LOG.info("Repeated Multiplication : " + length); - - length = numberOfDigits.shiftOperators(602); - LOG.info("Shift Operators : " + length); - - length = numberOfDigits.dividingWithPowersOf2(602); - LOG.info("Dividing with Powers of 2 : " + length); - - length = numberOfDigits.divideAndConquer(602); - LOG.info("Divide And Conquer : " + length); - } +package com.baeldung.numberofdigits; + +import org.apache.log4j.Logger; + +public class NumberOfDigitsDriver { + private static NumberOfDigits numberOfDigits; + + private static Logger LOG = Logger.getLogger(NumberOfDigitsDriver.class); + + static { + numberOfDigits = new NumberOfDigits(); + } + + public static void main(String[] args) { + LOG.info("Testing all methods..."); + + long length = numberOfDigits.stringBasedSolution(602); + LOG.info("String Based Solution : " + length); + + length = numberOfDigits.logarithmicApproach(602); + LOG.info("Logarithmic Approach : " + length); + + length = numberOfDigits.repeatedMultiplication(602); + LOG.info("Repeated Multiplication : " + length); + + length = numberOfDigits.shiftOperators(602); + LOG.info("Shift Operators : " + length); + + length = numberOfDigits.dividingWithPowersOf2(602); + LOG.info("Dividing with Powers of 2 : " + length); + + length = numberOfDigits.divideAndConquer(602); + LOG.info("Divide And Conquer : " + length); + } } \ No newline at end of file diff --git a/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java diff --git a/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java diff --git a/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java diff --git a/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java diff --git a/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java b/core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java similarity index 100% rename from java-numbers/src/main/java/com/baeldung/string/DoubleToString.java rename to core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java diff --git a/java-numbers/src/main/resources/log4j.properties b/core-java-modules/java-numbers/src/main/resources/log4j.properties similarity index 100% rename from java-numbers/src/main/resources/log4j.properties rename to core-java-modules/java-numbers/src/main/resources/log4j.properties diff --git a/java-numbers/src/main/resources/logback.xml b/core-java-modules/java-numbers/src/main/resources/logback.xml similarity index 100% rename from java-numbers/src/main/resources/logback.xml rename to core-java-modules/java-numbers/src/main/resources/logback.xml diff --git a/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java similarity index 96% rename from java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java index 786e5af312..b6799ce0d8 100644 --- a/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java +++ b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java @@ -1,25 +1,25 @@ -package com.baeldung.maths; - -import org.junit.Assert; -import org.junit.Test; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -public class BigDecimalImplUnitTest { - - @Test - public void givenBigDecimalNumbers_whenAddedTogether_thenGetExpectedResult() { - BigDecimal serviceTax = new BigDecimal("56.0084578639"); - serviceTax = serviceTax.setScale(2, RoundingMode.CEILING); - - BigDecimal entertainmentTax = new BigDecimal("23.00689"); - entertainmentTax = entertainmentTax.setScale(2, RoundingMode.FLOOR); - - BigDecimal totalTax = serviceTax.add(entertainmentTax); - BigDecimal result = BigDecimal.valueOf(79.01); - - Assert.assertEquals(result, totalTax); - - } -} +package com.baeldung.maths; + +import org.junit.Assert; +import org.junit.Test; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +public class BigDecimalImplUnitTest { + + @Test + public void givenBigDecimalNumbers_whenAddedTogether_thenGetExpectedResult() { + BigDecimal serviceTax = new BigDecimal("56.0084578639"); + serviceTax = serviceTax.setScale(2, RoundingMode.CEILING); + + BigDecimal entertainmentTax = new BigDecimal("23.00689"); + entertainmentTax = entertainmentTax.setScale(2, RoundingMode.FLOOR); + + BigDecimal totalTax = serviceTax.add(entertainmentTax); + BigDecimal result = BigDecimal.valueOf(79.01); + + Assert.assertEquals(result, totalTax); + + } +} diff --git a/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java similarity index 96% rename from java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java index 4c45f69090..9a9ac963e0 100644 --- a/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java +++ b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java @@ -1,21 +1,21 @@ -package com.baeldung.maths; - -import org.junit.Assert; -import org.junit.Test; - -import java.math.BigInteger; - -public class BigIntegerImplUnitTest { - - @Test - public void givenBigIntegerNumbers_whenAddedTogether_thenGetExpectedResult() { - BigInteger numStarsMilkyWay = new BigInteger("8731409320171337804361260816606476"); - BigInteger numStarsAndromeda = new BigInteger("5379309320171337804361260816606476"); - - BigInteger totalStars = numStarsMilkyWay.add(numStarsAndromeda); - BigInteger result = new BigInteger("14110718640342675608722521633212952"); - - Assert.assertEquals(result, totalStars); - } - -} +package com.baeldung.maths; + +import org.junit.Assert; +import org.junit.Test; + +import java.math.BigInteger; + +public class BigIntegerImplUnitTest { + + @Test + public void givenBigIntegerNumbers_whenAddedTogether_thenGetExpectedResult() { + BigInteger numStarsMilkyWay = new BigInteger("8731409320171337804361260816606476"); + BigInteger numStarsAndromeda = new BigInteger("5379309320171337804361260816606476"); + + BigInteger totalStars = numStarsMilkyWay.add(numStarsAndromeda); + BigInteger result = new BigInteger("14110718640342675608722521633212952"); + + Assert.assertEquals(result, totalStars); + } + +} diff --git a/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java similarity index 96% rename from java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java index 6812a8f588..bbd06dbf75 100644 --- a/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java +++ b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java @@ -1,45 +1,45 @@ -package com.baeldung.maths; - -import java.math.BigDecimal; - -import org.junit.Assert; -import org.junit.Test; - -public class FloatingPointArithmeticUnitTest { - - @Test - public void givenDecimalNumbers_whenAddedTogether_thenGetExpectedResult() { - double a = 13.22; - double b = 4.88; - double c = 21.45; - double result = 39.55; - - double abc = a + b + c; - double acb = a + c + b; - - Assert.assertEquals(result, abc, 0); - Assert.assertNotEquals(result, acb, 0); - - double ab = 18.1; - double ac = 34.67; - - double ab_c = ab + c; - double ac_b = ac + b; - - Assert.assertEquals(result, ab_c, 0); - Assert.assertNotEquals(result, ac_b, 0); - - BigDecimal d = new BigDecimal(String.valueOf(a)); - BigDecimal e = new BigDecimal(String.valueOf(b)); - BigDecimal f = new BigDecimal(String.valueOf(c)); - BigDecimal sum = new BigDecimal("39.55"); - - BigDecimal def = d.add(e).add(f); - BigDecimal dfe = d.add(f).add(e); - - Assert.assertEquals(0, def.compareTo(sum)); - Assert.assertEquals(0, dfe.compareTo(sum)); - - Assert.assertNotEquals(0, sum.compareTo(new BigDecimal(String.valueOf(acb)))); - } -} +package com.baeldung.maths; + +import java.math.BigDecimal; + +import org.junit.Assert; +import org.junit.Test; + +public class FloatingPointArithmeticUnitTest { + + @Test + public void givenDecimalNumbers_whenAddedTogether_thenGetExpectedResult() { + double a = 13.22; + double b = 4.88; + double c = 21.45; + double result = 39.55; + + double abc = a + b + c; + double acb = a + c + b; + + Assert.assertEquals(result, abc, 0); + Assert.assertNotEquals(result, acb, 0); + + double ab = 18.1; + double ac = 34.67; + + double ab_c = ab + c; + double ac_b = ac + b; + + Assert.assertEquals(result, ab_c, 0); + Assert.assertNotEquals(result, ac_b, 0); + + BigDecimal d = new BigDecimal(String.valueOf(a)); + BigDecimal e = new BigDecimal(String.valueOf(b)); + BigDecimal f = new BigDecimal(String.valueOf(c)); + BigDecimal sum = new BigDecimal("39.55"); + + BigDecimal def = d.add(e).add(f); + BigDecimal dfe = d.add(f).add(e); + + Assert.assertEquals(0, def.compareTo(sum)); + Assert.assertEquals(0, dfe.compareTo(sum)); + + Assert.assertNotEquals(0, sum.compareTo(new BigDecimal(String.valueOf(acb)))); + } +} diff --git a/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java similarity index 98% rename from java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java index 7e3f5d6c63..19f4797e91 100644 --- a/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java +++ b/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java @@ -1,71 +1,71 @@ -package com.baeldung.maths; - -import org.apache.commons.math3.util.Precision; -import org.decimal4j.util.DoubleRounder; -import org.junit.Assert; -import org.junit.Test; - -public class RoundUnitTest { - private double value = 2.03456d; - private int places = 2; - private double delta = 0.0d; - private double expected = 2.03d; - - @Test - public void givenDecimalNumber_whenRoundToNDecimalPlaces_thenGetExpectedResult() { - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); - Assert.assertEquals(expected, Round.roundAvoid(value, places), delta); - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); - - places = 3; - expected = 2.035d; - - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); - Assert.assertEquals(expected, Round.roundAvoid(value, places), delta); - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); - - value = 1000.0d; - places = 17; - expected = 1000.0d; - - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); - Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 92.23372036854776 ! - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); - - value = 256.025d; - places = 2; - expected = 256.03d; - - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 256.02 ! - Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 256.02 ! - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 256.02 ! - - value = 260.775d; - places = 2; - expected = 260.78d; - - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 260.77 ! - Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 260.77 ! - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 260.77 ! - - value = 90080070060.1d; - places = 9; - expected = 90080070060.1d; - - Assert.assertEquals(expected, Round.round(value, places), delta); - Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); - Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 9.223372036854776E9 ! - Assert.assertEquals(expected, Precision.round(value, places), delta); - Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); - } -} +package com.baeldung.maths; + +import org.apache.commons.math3.util.Precision; +import org.decimal4j.util.DoubleRounder; +import org.junit.Assert; +import org.junit.Test; + +public class RoundUnitTest { + private double value = 2.03456d; + private int places = 2; + private double delta = 0.0d; + private double expected = 2.03d; + + @Test + public void givenDecimalNumber_whenRoundToNDecimalPlaces_thenGetExpectedResult() { + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); + Assert.assertEquals(expected, Round.roundAvoid(value, places), delta); + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); + + places = 3; + expected = 2.035d; + + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); + Assert.assertEquals(expected, Round.roundAvoid(value, places), delta); + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); + + value = 1000.0d; + places = 17; + expected = 1000.0d; + + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); + Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 92.23372036854776 ! + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); + + value = 256.025d; + places = 2; + expected = 256.03d; + + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 256.02 ! + Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 256.02 ! + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 256.02 ! + + value = 260.775d; + places = 2; + expected = 260.78d; + + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 260.77 ! + Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 260.77 ! + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 260.77 ! + + value = 90080070060.1d; + places = 9; + expected = 90080070060.1d; + + Assert.assertEquals(expected, Round.round(value, places), delta); + Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta); + Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 9.223372036854776E9 ! + Assert.assertEquals(expected, Precision.round(value, places), delta); + Assert.assertEquals(expected, DoubleRounder.round(value, places), delta); + } +} diff --git a/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java similarity index 96% rename from java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java index b348fe01ef..bfd5ae485b 100644 --- a/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java +++ b/core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java @@ -1,106 +1,106 @@ -package com.baeldung.numberofdigits; - -import org.junit.Assert; -import org.junit.Assume; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; - -@RunWith(Theories.class) -public class NumberOfDigitsIntegrationTest { - - private static NumberOfDigits numberOfDigits; - - static { - numberOfDigits = new NumberOfDigits(); - } - - @DataPoints - public static int[][] lowestIntegers() - { - return new int[][]{ - {1, 1}, - {2, 10}, - {3, 100}, - {4, 1000}, - {5, 10000}, - {6, 100000}, - {7, 1000000}, - {8, 10000000}, - {9, 100000000}, - {10, 1000000000} - }; - } - - @DataPoints - public static int[][] highestIntegers() - { - return new int[][]{ - {1, 9}, - {2, 99}, - {3, 999}, - {4, 9999}, - {5, 99999}, - {6, 999999}, - {7, 9999999}, - {8, 99999999}, - {9, 999999999}, - {10, Integer.MAX_VALUE} - }; - } - - @DataPoints - public static int[][] randomIntegers() - { - return new int[][]{ - {1, 1}, - {2, 14}, - {3, 549}, - {4, 1136}, - {5, 25340}, - {6, 134321}, - {7, 1435432}, - {8, 54234129}, - {9, 113683912}, - {10, 1534031982} - }; - } - - @Theory - public void givenDataPoints_whenStringBasedSolutionInvoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.stringBasedSolution(entry[1])); - } - - @Theory - public void givenDataPoints_whenLogarithmicApproachInvoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.logarithmicApproach(entry[1])); - } - - @Theory - public void givenDataPoints_whenRepeatedMultiplicationInvoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.repeatedMultiplication(entry[1])); - } - - @Theory - public void givenDataPoints_whenShiftOperatorsInvoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.shiftOperators(entry[1])); - } - - @Theory - public void givenDataPoints_whenDividingWithPowersOf2Invoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.dividingWithPowersOf2(entry[1])); - } - - @Theory - public void givenDataPoints_whenDivideAndConquerInvoked_thenAllPointsMatch(final int[] entry) { - Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); - Assert.assertEquals(entry[0], numberOfDigits.divideAndConquer(entry[1])); - } - +package com.baeldung.numberofdigits; + +import org.junit.Assert; +import org.junit.Assume; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; + +@RunWith(Theories.class) +public class NumberOfDigitsIntegrationTest { + + private static NumberOfDigits numberOfDigits; + + static { + numberOfDigits = new NumberOfDigits(); + } + + @DataPoints + public static int[][] lowestIntegers() + { + return new int[][]{ + {1, 1}, + {2, 10}, + {3, 100}, + {4, 1000}, + {5, 10000}, + {6, 100000}, + {7, 1000000}, + {8, 10000000}, + {9, 100000000}, + {10, 1000000000} + }; + } + + @DataPoints + public static int[][] highestIntegers() + { + return new int[][]{ + {1, 9}, + {2, 99}, + {3, 999}, + {4, 9999}, + {5, 99999}, + {6, 999999}, + {7, 9999999}, + {8, 99999999}, + {9, 999999999}, + {10, Integer.MAX_VALUE} + }; + } + + @DataPoints + public static int[][] randomIntegers() + { + return new int[][]{ + {1, 1}, + {2, 14}, + {3, 549}, + {4, 1136}, + {5, 25340}, + {6, 134321}, + {7, 1435432}, + {8, 54234129}, + {9, 113683912}, + {10, 1534031982} + }; + } + + @Theory + public void givenDataPoints_whenStringBasedSolutionInvoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.stringBasedSolution(entry[1])); + } + + @Theory + public void givenDataPoints_whenLogarithmicApproachInvoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.logarithmicApproach(entry[1])); + } + + @Theory + public void givenDataPoints_whenRepeatedMultiplicationInvoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.repeatedMultiplication(entry[1])); + } + + @Theory + public void givenDataPoints_whenShiftOperatorsInvoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.shiftOperators(entry[1])); + } + + @Theory + public void givenDataPoints_whenDividingWithPowersOf2Invoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.dividingWithPowersOf2(entry[1])); + } + + @Theory + public void givenDataPoints_whenDivideAndConquerInvoked_thenAllPointsMatch(final int[] entry) { + Assume.assumeTrue(entry[0] > 0 && entry[1] > 0); + Assert.assertEquals(entry[0], numberOfDigits.divideAndConquer(entry[1])); + } + } \ No newline at end of file diff --git a/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java diff --git a/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java diff --git a/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java b/core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java similarity index 100% rename from java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java rename to core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 15347d0fe9..8d30c545e2 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -123,6 +123,10 @@ java-collections-conversions-2 java-collections-maps-3 pre-jpms + java-numbers + java-numbers-2 + java-numbers-3 + java-numbers-4 diff --git a/docker-modules/README.md b/docker-modules/README.md index b2ae5d56c9..f5daa19b08 100644 --- a/docker-modules/README.md +++ b/docker-modules/README.md @@ -2,7 +2,6 @@ - [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) -- [Running Spring Boot with PostgreSQL in Docker Compose](https://www.baeldung.com/spring-boot-postgresql-docker) - [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) diff --git a/docker-modules/docker-sample-app/README.md b/docker-modules/docker-sample-app/README.md deleted file mode 100644 index 6aeaa1d2a3..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 diff --git a/docker-modules/docker-spring-boot-postgres/README.md b/docker-modules/docker-spring-boot-postgres/README.md new file mode 100644 index 0000000000..c7e83a2e7c --- /dev/null +++ b/docker-modules/docker-spring-boot-postgres/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- [Running Spring Boot with PostgreSQL in Docker Compose](https://www.baeldung.com/spring-boot-postgresql-docker) diff --git a/docker-modules/heap-sizing/README.md b/docker-modules/heap-sizing/README.md new file mode 100644 index 0000000000..aa5167cc16 --- /dev/null +++ b/docker-modules/heap-sizing/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) 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 6afad80652..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:2.0.1' + classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" } } @@ -20,7 +21,7 @@ jar { } from { - configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } @@ -30,12 +31,13 @@ task customFatJar(type: Jar) { attributes 'Main-Class': 'com.baeldung.fatjar.Application' } baseName = 'all-in-one-jar' - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } with jar } dependencies{ - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' - compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' -} \ No newline at end of file + implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' +} diff --git a/gradle/gradle-fat-jar/settings.gradle b/gradle/gradle-fat-jar/settings.gradle new file mode 100644 index 0000000000..5abc556780 --- /dev/null +++ b/gradle/gradle-fat-jar/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-fat-jar' diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..7454180f2a Binary files /dev/null and b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties index a4b4429748..ffed3a254e 100644 --- a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/gradle-wrapper/gradlew b/gradle/gradle-wrapper/gradlew index 2fe81a7d95..1b6c787337 100755 --- a/gradle/gradle-wrapper/gradlew +++ b/gradle/gradle-wrapper/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -105,79 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradle/gradle-wrapper/gradlew.bat b/gradle/gradle-wrapper/gradlew.bat index 9109989e3c..ac1b06f938 100644 --- a/gradle/gradle-wrapper/gradlew.bat +++ b/gradle/gradle-wrapper/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/gradle/gradle-wrapper/settings.gradle b/gradle/gradle-wrapper/settings.gradle new file mode 100644 index 0000000000..e90020b9e3 --- /dev/null +++ b/gradle/gradle-wrapper/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-wrapper' 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 { diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java index c78129a9cf..72a2b39a67 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java @@ -1,6 +1,7 @@ package com.baeldung.servlets; import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -11,30 +12,25 @@ import java.io.IOException; public class FormServlet extends HttpServlet { @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String height = request.getParameter("height"); String weight = request.getParameter("weight"); - try { double bmi = calculateBMI(Double.parseDouble(weight), Double.parseDouble(height)); - request.setAttribute("bmi", bmi); response.setHeader("Test", "Success"); response.setHeader("BMI", String.valueOf(bmi)); - - RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/jsp/index.jsp"); - dispatcher.forward(request, response); + request.getRequestDispatcher("/WEB-INF/jsp/index.jsp").forward(request, response); } catch (Exception e) { - response.sendRedirect("index.jsp"); + request.getRequestDispatcher("/WEB-INF/jsp/index.jsp").forward(request, response); } } @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) { - - // do something else here + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/jsp/index.jsp"); + dispatcher.forward(request, response); } private Double calculateBMI(Double weight, Double height) { diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/MainServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/MainServlet.java index d4417b0b4e..12c75444bb 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/MainServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/MainServlet.java @@ -12,8 +12,7 @@ public class MainServlet extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.sendRedirect("main.jsp"); + request.getRequestDispatcher("/WEB-INF/jsp/main.jsp").forward(request, response); } diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java index b4d80db0ab..92530c2887 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java @@ -2,6 +2,8 @@ package com.baeldung.servlets; import java.io.IOException; import java.io.PrintWriter; +import java.util.Arrays; +import java.util.Collections; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -20,7 +22,7 @@ public class MyHttpServlet extends HttpServlet { writer.println(request.getLocalAddr()); } else if ("getLocalName".equals(request.getParameter("function"))) { writer.println(request.getLocalName()); - } else if ("getLocalAPort".equals(request.getParameter("function"))) { + } else if ("getLocalPort".equals(request.getParameter("function"))) { writer.println(request.getLocalPort()); } else if ("getMethod".equals(request.getParameter("function"))) { writer.println(request.getMethod()); diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/UpdateServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/UpdateServlet.java index 35c9819a6f..721e3afe6b 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/UpdateServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/UpdateServlet.java @@ -25,9 +25,7 @@ public class UpdateServlet extends HttpServlet { request.setAttribute("sessionData", session); } - RequestDispatcher requestDispather = request.getRequestDispatcher("update.jsp"); - - requestDispather.forward(request, response); + request.getRequestDispatcher("/WEB-INF/jsp/update.jsp").forward(request, response); } } diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/UserLoginServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/UserLoginServlet.java index 6becf04a0c..fd732ef89d 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/UserLoginServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/UserLoginServlet.java @@ -21,9 +21,7 @@ public class UserLoginServlet extends HttpServlet { request.setAttribute("id", session.getAttribute("userId")); - RequestDispatcher requestDispather = request.getRequestDispatcher("userlogin.jsp"); - - requestDispather.forward(request, response); + request.getRequestDispatcher("/WEB-INF/jsp/userlogin.jsp").forward(request, response); } diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java index 269cee3922..24f2500aa4 100644 --- a/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java +++ b/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@WebServlet(name = "UserServlet", urlPatterns = {"/userServlet"}, initParams={ +@WebServlet(name = "UserServlet", urlPatterns = "/userServlet", initParams={ @WebInitParam(name="name", value="Not provided"), @WebInitParam(name="email", value="Not provided")}) public class UserServlet extends HttpServlet { @@ -16,13 +16,13 @@ public class UserServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + processRequest(request, response); + forwardRequest(request, response, "/WEB-INF/jsp/result.jsp"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - forwardRequest(request, response, "/WEB-INF/jsp/result.jsp"); } protected void processRequest(HttpServletRequest request, HttpServletResponse response) diff --git a/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp b/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp index 01cc54858e..7259b96ed0 100644 --- a/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp +++ b/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp @@ -1,4 +1,3 @@ -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ page contentType="text/html" pageEncoding="UTF-8"%> diff --git a/javax-servlets/src/main/webapp/user.jsp b/javax-servlets/src/main/webapp/user.jsp index c6e1bb69f9..2139052a3a 100644 --- a/javax-servlets/src/main/webapp/user.jsp +++ b/javax-servlets/src/main/webapp/user.jsp @@ -1,4 +1,3 @@ -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ page contentType="text/html" pageEncoding="UTF-8"%> diff --git a/jhipster/README.md b/jhipster-modules/README.md similarity index 100% rename from jhipster/README.md rename to jhipster-modules/README.md diff --git a/jhipster/jhipster-microservice/README.md b/jhipster-modules/jhipster-microservice/README.md similarity index 100% rename from jhipster/jhipster-microservice/README.md rename to jhipster-modules/jhipster-microservice/README.md diff --git a/jhipster/jhipster-microservice/car-app/.editorconfig b/jhipster-modules/jhipster-microservice/car-app/.editorconfig similarity index 100% rename from jhipster/jhipster-microservice/car-app/.editorconfig rename to jhipster-modules/jhipster-microservice/car-app/.editorconfig diff --git a/jhipster/jhipster-microservice/car-app/.gitattributes b/jhipster-modules/jhipster-microservice/car-app/.gitattributes similarity index 100% rename from jhipster/jhipster-microservice/car-app/.gitattributes rename to jhipster-modules/jhipster-microservice/car-app/.gitattributes diff --git a/jhipster/jhipster-microservice/car-app/.gitignore b/jhipster-modules/jhipster-microservice/car-app/.gitignore similarity index 100% rename from jhipster/jhipster-microservice/car-app/.gitignore rename to jhipster-modules/jhipster-microservice/car-app/.gitignore diff --git a/jhipster/jhipster-microservice/car-app/.jhipster/Car.json b/jhipster-modules/jhipster-microservice/car-app/.jhipster/Car.json similarity index 100% rename from jhipster/jhipster-microservice/car-app/.jhipster/Car.json rename to jhipster-modules/jhipster-microservice/car-app/.jhipster/Car.json diff --git a/jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-microservice/car-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/car-app/.yo-rc.json similarity index 100% rename from jhipster/jhipster-microservice/car-app/.yo-rc.json rename to jhipster-modules/jhipster-microservice/car-app/.yo-rc.json diff --git a/jhipster/jhipster-microservice/car-app/README.md b/jhipster-modules/jhipster-microservice/car-app/README.md similarity index 100% rename from jhipster/jhipster-microservice/car-app/README.md rename to jhipster-modules/jhipster-microservice/car-app/README.md diff --git a/jhipster/jhipster-microservice/car-app/mvnw b/jhipster-modules/jhipster-microservice/car-app/mvnw similarity index 100% rename from jhipster/jhipster-microservice/car-app/mvnw rename to jhipster-modules/jhipster-microservice/car-app/mvnw diff --git a/jhipster/jhipster-microservice/car-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/car-app/mvnw.cmd similarity index 100% rename from jhipster/jhipster-microservice/car-app/mvnw.cmd rename to jhipster-modules/jhipster-microservice/car-app/mvnw.cmd diff --git a/jhipster/jhipster-microservice/car-app/package.json b/jhipster-modules/jhipster-microservice/car-app/package.json similarity index 100% rename from jhipster/jhipster-microservice/car-app/package.json rename to jhipster-modules/jhipster-microservice/car-app/package.json diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster-modules/jhipster-microservice/car-app/pom.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/pom.xml rename to jhipster-modules/jhipster-microservice/car-app/pom.xml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/app.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/app.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/banner.txt rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/banner.txt diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java rename to jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/logback-test.xml similarity index 100% rename from jhipster/jhipster-microservice/car-app/src/test/resources/logback-test.xml rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/logback-test.xml diff --git a/jhipster/jhipster-microservice/car-app/yarn.lock b/jhipster-modules/jhipster-microservice/car-app/yarn.lock similarity index 100% rename from jhipster/jhipster-microservice/car-app/yarn.lock rename to jhipster-modules/jhipster-microservice/car-app/yarn.lock diff --git a/jhipster/jhipster-microservice/dealer-app/.editorconfig b/jhipster-modules/jhipster-microservice/dealer-app/.editorconfig similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.editorconfig rename to jhipster-modules/jhipster-microservice/dealer-app/.editorconfig diff --git a/jhipster/jhipster-microservice/dealer-app/.gitattributes b/jhipster-modules/jhipster-microservice/dealer-app/.gitattributes similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.gitattributes rename to jhipster-modules/jhipster-microservice/dealer-app/.gitattributes diff --git a/jhipster/jhipster-microservice/dealer-app/.gitignore b/jhipster-modules/jhipster-microservice/dealer-app/.gitignore similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.gitignore rename to jhipster-modules/jhipster-microservice/dealer-app/.gitignore diff --git a/jhipster/jhipster-microservice/dealer-app/.jhipster/Dealer.json b/jhipster-modules/jhipster-microservice/dealer-app/.jhipster/Dealer.json similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.jhipster/Dealer.json rename to jhipster-modules/jhipster-microservice/dealer-app/.jhipster/Dealer.json diff --git a/jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-microservice/dealer-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/dealer-app/.yo-rc.json similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/.yo-rc.json rename to jhipster-modules/jhipster-microservice/dealer-app/.yo-rc.json diff --git a/jhipster/jhipster-microservice/dealer-app/README.md b/jhipster-modules/jhipster-microservice/dealer-app/README.md similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/README.md rename to jhipster-modules/jhipster-microservice/dealer-app/README.md diff --git a/jhipster/jhipster-microservice/dealer-app/mvnw b/jhipster-modules/jhipster-microservice/dealer-app/mvnw similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/mvnw rename to jhipster-modules/jhipster-microservice/dealer-app/mvnw diff --git a/jhipster/jhipster-microservice/dealer-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/dealer-app/mvnw.cmd similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/mvnw.cmd rename to jhipster-modules/jhipster-microservice/dealer-app/mvnw.cmd diff --git a/jhipster/jhipster-microservice/dealer-app/package.json b/jhipster-modules/jhipster-microservice/dealer-app/package.json similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/package.json rename to jhipster-modules/jhipster-microservice/dealer-app/package.json diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/pom.xml rename to jhipster-modules/jhipster-microservice/dealer-app/pom.xml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/app.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/app.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/banner.txt rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/banner.txt diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml diff --git a/jhipster/jhipster-microservice/dealer-app/yarn.lock b/jhipster-modules/jhipster-microservice/dealer-app/yarn.lock similarity index 100% rename from jhipster/jhipster-microservice/dealer-app/yarn.lock rename to jhipster-modules/jhipster-microservice/dealer-app/yarn.lock diff --git a/jhipster/jhipster-microservice/gateway-app/.bowerrc b/jhipster-modules/jhipster-microservice/gateway-app/.bowerrc similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.bowerrc rename to jhipster-modules/jhipster-microservice/gateway-app/.bowerrc diff --git a/jhipster/jhipster-microservice/gateway-app/.editorconfig b/jhipster-modules/jhipster-microservice/gateway-app/.editorconfig similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.editorconfig rename to jhipster-modules/jhipster-microservice/gateway-app/.editorconfig diff --git a/jhipster/jhipster-microservice/gateway-app/.eslintignore b/jhipster-modules/jhipster-microservice/gateway-app/.eslintignore similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.eslintignore rename to jhipster-modules/jhipster-microservice/gateway-app/.eslintignore diff --git a/jhipster/jhipster-microservice/gateway-app/.eslintrc.json b/jhipster-modules/jhipster-microservice/gateway-app/.eslintrc.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.eslintrc.json rename to jhipster-modules/jhipster-microservice/gateway-app/.eslintrc.json diff --git a/jhipster/jhipster-microservice/gateway-app/.gitattributes b/jhipster-modules/jhipster-microservice/gateway-app/.gitattributes similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.gitattributes rename to jhipster-modules/jhipster-microservice/gateway-app/.gitattributes diff --git a/jhipster/jhipster-microservice/gateway-app/.gitignore b/jhipster-modules/jhipster-microservice/gateway-app/.gitignore similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.gitignore rename to jhipster-modules/jhipster-microservice/gateway-app/.gitignore diff --git a/jhipster/jhipster-microservice/gateway-app/.jhipster/Car.json b/jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Car.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.jhipster/Car.json rename to jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Car.json diff --git a/jhipster/jhipster-microservice/gateway-app/.jhipster/Dealer.json b/jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Dealer.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.jhipster/Dealer.json rename to jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Dealer.json diff --git a/jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-microservice/gateway-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/gateway-app/.yo-rc.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/.yo-rc.json rename to jhipster-modules/jhipster-microservice/gateway-app/.yo-rc.json diff --git a/jhipster/jhipster-microservice/gateway-app/README.md b/jhipster-modules/jhipster-microservice/gateway-app/README.md similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/README.md rename to jhipster-modules/jhipster-microservice/gateway-app/README.md diff --git a/jhipster/jhipster-microservice/gateway-app/bower.json b/jhipster-modules/jhipster-microservice/gateway-app/bower.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/bower.json rename to jhipster-modules/jhipster-microservice/gateway-app/bower.json diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/build.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/build.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/build.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/build.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/config.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/config.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/config.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/copy.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/copy.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/copy.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/copy.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/handle-errors.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/handle-errors.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/handle-errors.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/handle-errors.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/inject.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/inject.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/inject.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/inject.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/serve.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/serve.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/serve.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/serve.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/utils.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/utils.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulp/utils.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/utils.js diff --git a/jhipster/jhipster-microservice/gateway-app/gulpfile.js b/jhipster-modules/jhipster-microservice/gateway-app/gulpfile.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/gulpfile.js rename to jhipster-modules/jhipster-microservice/gateway-app/gulpfile.js diff --git a/jhipster/jhipster-microservice/gateway-app/mvnw b/jhipster-modules/jhipster-microservice/gateway-app/mvnw similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/mvnw rename to jhipster-modules/jhipster-microservice/gateway-app/mvnw diff --git a/jhipster/jhipster-microservice/gateway-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/gateway-app/mvnw.cmd similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/mvnw.cmd rename to jhipster-modules/jhipster-microservice/gateway-app/mvnw.cmd diff --git a/jhipster/jhipster-microservice/gateway-app/package.json b/jhipster-modules/jhipster-microservice/gateway-app/package.json similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/package.json rename to jhipster-modules/jhipster-microservice/gateway-app/package.json diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/pom.xml rename to jhipster-modules/jhipster-microservice/gateway-app/pom.xml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/app.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/app.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/banner.txt rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/banner.txt diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/404.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/404.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/404.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/404.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/index.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/index.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/index.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/index.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/robots.txt b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/robots.txt similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/robots.txt rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/robots.txt diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml diff --git a/jhipster/jhipster-microservice/gateway-app/yarn.lock b/jhipster-modules/jhipster-microservice/gateway-app/yarn.lock similarity index 100% rename from jhipster/jhipster-microservice/gateway-app/yarn.lock rename to jhipster-modules/jhipster-microservice/gateway-app/yarn.lock diff --git a/jhipster/jhipster-microservice/pom.xml b/jhipster-modules/jhipster-microservice/pom.xml similarity index 100% rename from jhipster/jhipster-microservice/pom.xml rename to jhipster-modules/jhipster-microservice/pom.xml diff --git a/jhipster/jhipster-monolithic/.editorconfig b/jhipster-modules/jhipster-monolithic/.editorconfig similarity index 100% rename from jhipster/jhipster-monolithic/.editorconfig rename to jhipster-modules/jhipster-monolithic/.editorconfig diff --git a/jhipster/jhipster-monolithic/.gitattributes b/jhipster-modules/jhipster-monolithic/.gitattributes similarity index 100% rename from jhipster/jhipster-monolithic/.gitattributes rename to jhipster-modules/jhipster-monolithic/.gitattributes diff --git a/jhipster/jhipster-monolithic/.gitignore b/jhipster-modules/jhipster-monolithic/.gitignore similarity index 100% rename from jhipster/jhipster-monolithic/.gitignore rename to jhipster-modules/jhipster-monolithic/.gitignore diff --git a/jhipster/jhipster-monolithic/.gitlab-ci.yml b/jhipster-modules/jhipster-monolithic/.gitlab-ci.yml similarity index 100% rename from jhipster/jhipster-monolithic/.gitlab-ci.yml rename to jhipster-modules/jhipster-monolithic/.gitlab-ci.yml diff --git a/jhipster/jhipster-monolithic/.jhipster/Comment.json b/jhipster-modules/jhipster-monolithic/.jhipster/Comment.json similarity index 100% rename from jhipster/jhipster-monolithic/.jhipster/Comment.json rename to jhipster-modules/jhipster-monolithic/.jhipster/Comment.json diff --git a/jhipster/jhipster-monolithic/.jhipster/Post.json b/jhipster-modules/jhipster-monolithic/.jhipster/Post.json similarity index 100% rename from jhipster/jhipster-monolithic/.jhipster/Post.json rename to jhipster-modules/jhipster-monolithic/.jhipster/Post.json diff --git a/jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-monolithic/.travis.yml b/jhipster-modules/jhipster-monolithic/.travis.yml similarity index 100% rename from jhipster/jhipster-monolithic/.travis.yml rename to jhipster-modules/jhipster-monolithic/.travis.yml diff --git a/jhipster/jhipster-monolithic/.yo-rc.json b/jhipster-modules/jhipster-monolithic/.yo-rc.json similarity index 100% rename from jhipster/jhipster-monolithic/.yo-rc.json rename to jhipster-modules/jhipster-monolithic/.yo-rc.json diff --git a/jhipster/jhipster-monolithic/Jenkinsfile b/jhipster-modules/jhipster-monolithic/Jenkinsfile similarity index 100% rename from jhipster/jhipster-monolithic/Jenkinsfile rename to jhipster-modules/jhipster-monolithic/Jenkinsfile diff --git a/jhipster/jhipster-monolithic/README.md b/jhipster-modules/jhipster-monolithic/README.md similarity index 100% rename from jhipster/jhipster-monolithic/README.md rename to jhipster-modules/jhipster-monolithic/README.md diff --git a/jhipster/jhipster-monolithic/angular-cli.json b/jhipster-modules/jhipster-monolithic/angular-cli.json similarity index 100% rename from jhipster/jhipster-monolithic/angular-cli.json rename to jhipster-modules/jhipster-monolithic/angular-cli.json diff --git a/jhipster/jhipster-monolithic/circle.yml b/jhipster-modules/jhipster-monolithic/circle.yml similarity index 100% rename from jhipster/jhipster-monolithic/circle.yml rename to jhipster-modules/jhipster-monolithic/circle.yml diff --git a/jhipster/jhipster-monolithic/mvnw b/jhipster-modules/jhipster-monolithic/mvnw similarity index 100% rename from jhipster/jhipster-monolithic/mvnw rename to jhipster-modules/jhipster-monolithic/mvnw diff --git a/jhipster/jhipster-monolithic/mvnw.cmd b/jhipster-modules/jhipster-monolithic/mvnw.cmd similarity index 100% rename from jhipster/jhipster-monolithic/mvnw.cmd rename to jhipster-modules/jhipster-monolithic/mvnw.cmd diff --git a/jhipster/jhipster-monolithic/package.json b/jhipster-modules/jhipster-monolithic/package.json similarity index 100% rename from jhipster/jhipster-monolithic/package.json rename to jhipster-modules/jhipster-monolithic/package.json diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster-modules/jhipster-monolithic/pom.xml similarity index 100% rename from jhipster/jhipster-monolithic/pom.xml rename to jhipster-modules/jhipster-monolithic/pom.xml diff --git a/jhipster/jhipster-monolithic/postcss.config.js b/jhipster-modules/jhipster-monolithic/postcss.config.js similarity index 100% rename from jhipster/jhipster-monolithic/postcss.config.js rename to jhipster-modules/jhipster-monolithic/postcss.config.js diff --git a/jhipster/jhipster-monolithic/src/main/docker/Dockerfile b/jhipster-modules/jhipster-monolithic/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-monolithic/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-monolithic/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-monolithic/src/main/docker/app.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/docker/app.yml rename to jhipster-modules/jhipster-monolithic/src/main/docker/app.yml diff --git a/jhipster/jhipster-monolithic/src/main/docker/mysql.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-monolithic/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-monolithic/src/main/docker/sonar.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-monolithic/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-monolithic/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-monolithic/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-monolithic/src/main/resources/banner.txt b/jhipster-modules/jhipster-monolithic/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/banner.txt rename to jhipster-modules/jhipster-monolithic/src/main/resources/banner.txt diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users.csv similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users.csv rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users.csv diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv diff --git a/jhipster/jhipster-monolithic/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-monolithic/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages_en.properties similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/i18n/messages_en.properties rename to jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages_en.properties diff --git a/jhipster/jhipster-monolithic/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-monolithic/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/activationEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/activationEmail.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/mails/activationEmail.html rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/activationEmail.html diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/creationEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/creationEmail.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/mails/creationEmail.html rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/creationEmail.html diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html diff --git a/jhipster/jhipster-monolithic/src/main/resources/templates/error.html b/jhipster-modules/jhipster-monolithic/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-monolithic/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/404.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/404.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/404.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/404.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/account.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/account.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/account.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/account.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.constants.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.constants.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.constants.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.main.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.main.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.main.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.main.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/polyfills.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/polyfills.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/polyfills.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/polyfills.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/index.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/index.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/index.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/vendor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/vendor.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/app/vendor.ts rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/vendor.ts diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster.png similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster.png rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster.png diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/scss/global.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/global.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/content/scss/global.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/global.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss diff --git a/jhipster/jhipster-monolithic/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-monolithic/src/main/webapp/favicon.ico similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/favicon.ico rename to jhipster-modules/jhipster-monolithic/src/main/webapp/favicon.ico diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/activate.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/activate.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/activate.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/activate.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/audits.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/audits.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/audits.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/audits.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/comment.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/comment.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/comment.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/comment.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/error.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/error.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/error.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/error.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/global.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/global.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/global.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/global.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/health.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/health.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/health.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/health.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/home.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/home.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/home.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/home.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/login.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/login.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/login.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/login.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/logs.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/logs.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/logs.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/logs.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/password.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/password.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/password.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/password.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/post.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/post.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/post.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/post.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/register.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/register.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/register.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/register.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/reset.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/reset.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/reset.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/reset.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/settings.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/settings.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/settings.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/settings.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json diff --git a/jhipster/jhipster-monolithic/src/main/webapp/index.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/index.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/index.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/index.html diff --git a/jhipster/jhipster-monolithic/src/main/webapp/robots.txt b/jhipster-modules/jhipster-monolithic/src/main/webapp/robots.txt similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/robots.txt rename to jhipster-modules/jhipster-monolithic/src/main/webapp/robots.txt diff --git a/jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif b/jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif rename to jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif diff --git a/jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/index.html similarity index 100% rename from jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/index.html rename to jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/index.html diff --git a/jhipster/jhipster-monolithic/src/test/gatling/conf/gatling.conf b/jhipster-modules/jhipster-monolithic/src/test/gatling/conf/gatling.conf similarity index 100% rename from jhipster/jhipster-monolithic/src/test/gatling/conf/gatling.conf rename to jhipster-modules/jhipster-monolithic/src/test/gatling/conf/gatling.conf diff --git a/jhipster/jhipster-monolithic/src/test/gatling/conf/logback.xml b/jhipster-modules/jhipster-monolithic/src/test/gatling/conf/logback.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/test/gatling/conf/logback.xml rename to jhipster-modules/jhipster-monolithic/src/test/gatling/conf/logback.xml diff --git a/jhipster/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala b/jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala similarity index 100% rename from jhipster/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala rename to jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala diff --git a/jhipster/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala b/jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala similarity index 100% rename from jhipster/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala rename to jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java similarity index 100% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/karma.conf.js b/jhipster-modules/jhipster-monolithic/src/test/javascript/karma.conf.js similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/karma.conf.js rename to jhipster-modules/jhipster-monolithic/src/test/javascript/karma.conf.js diff --git a/jhipster/jhipster-monolithic/src/test/javascript/protractor.conf.js b/jhipster-modules/jhipster-monolithic/src/test/javascript/protractor.conf.js similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/protractor.conf.js rename to jhipster-modules/jhipster-monolithic/src/test/javascript/protractor.conf.js diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/entry.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/entry.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/entry.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/entry.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/test.module.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/test.module.ts similarity index 100% rename from jhipster/jhipster-monolithic/src/test/javascript/spec/test.module.ts rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/test.module.ts diff --git a/jhipster/jhipster-monolithic/src/test/resources/config/application.yml b/jhipster-modules/jhipster-monolithic/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-monolithic/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-monolithic/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-monolithic/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-monolithic/src/test/resources/logback-test.xml similarity index 100% rename from jhipster/jhipster-monolithic/src/test/resources/logback-test.xml rename to jhipster-modules/jhipster-monolithic/src/test/resources/logback-test.xml diff --git a/jhipster/jhipster-monolithic/tsconfig.json b/jhipster-modules/jhipster-monolithic/tsconfig.json similarity index 100% rename from jhipster/jhipster-monolithic/tsconfig.json rename to jhipster-modules/jhipster-monolithic/tsconfig.json diff --git a/jhipster/jhipster-monolithic/tslint.json b/jhipster-modules/jhipster-monolithic/tslint.json similarity index 100% rename from jhipster/jhipster-monolithic/tslint.json rename to jhipster-modules/jhipster-monolithic/tslint.json diff --git a/jhipster/jhipster-monolithic/webpack/webpack.common.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.common.js similarity index 100% rename from jhipster/jhipster-monolithic/webpack/webpack.common.js rename to jhipster-modules/jhipster-monolithic/webpack/webpack.common.js diff --git a/jhipster/jhipster-monolithic/webpack/webpack.dev.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.dev.js similarity index 100% rename from jhipster/jhipster-monolithic/webpack/webpack.dev.js rename to jhipster-modules/jhipster-monolithic/webpack/webpack.dev.js diff --git a/jhipster/jhipster-monolithic/webpack/webpack.prod.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.prod.js similarity index 100% rename from jhipster/jhipster-monolithic/webpack/webpack.prod.js rename to jhipster-modules/jhipster-monolithic/webpack/webpack.prod.js diff --git a/jhipster/jhipster-monolithic/webpack/webpack.vendor.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.vendor.js similarity index 100% rename from jhipster/jhipster-monolithic/webpack/webpack.vendor.js rename to jhipster-modules/jhipster-monolithic/webpack/webpack.vendor.js diff --git a/jhipster/jhipster-uaa/README.md b/jhipster-modules/jhipster-uaa/README.md similarity index 100% rename from jhipster/jhipster-uaa/README.md rename to jhipster-modules/jhipster-uaa/README.md diff --git a/jhipster/jhipster-uaa/gateway/.editorconfig b/jhipster-modules/jhipster-uaa/gateway/.editorconfig similarity index 100% rename from jhipster/jhipster-uaa/gateway/.editorconfig rename to jhipster-modules/jhipster-uaa/gateway/.editorconfig diff --git a/jhipster/jhipster-uaa/gateway/.gitattributes b/jhipster-modules/jhipster-uaa/gateway/.gitattributes similarity index 100% rename from jhipster/jhipster-uaa/gateway/.gitattributes rename to jhipster-modules/jhipster-uaa/gateway/.gitattributes diff --git a/jhipster/jhipster-uaa/gateway/.gitignore b/jhipster-modules/jhipster-uaa/gateway/.gitignore similarity index 100% rename from jhipster/jhipster-uaa/gateway/.gitignore rename to jhipster-modules/jhipster-uaa/gateway/.gitignore diff --git a/jhipster/jhipster-uaa/gateway/.huskyrc b/jhipster-modules/jhipster-uaa/gateway/.huskyrc similarity index 100% rename from jhipster/jhipster-uaa/gateway/.huskyrc rename to jhipster-modules/jhipster-uaa/gateway/.huskyrc diff --git a/jhipster/jhipster-uaa/gateway/.jhipster/Quote.json b/jhipster-modules/jhipster-uaa/gateway/.jhipster/Quote.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/.jhipster/Quote.json rename to jhipster-modules/jhipster-uaa/gateway/.jhipster/Quote.json diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-uaa/gateway/.prettierignore b/jhipster-modules/jhipster-uaa/gateway/.prettierignore similarity index 100% rename from jhipster/jhipster-uaa/gateway/.prettierignore rename to jhipster-modules/jhipster-uaa/gateway/.prettierignore diff --git a/jhipster/jhipster-uaa/gateway/.prettierrc b/jhipster-modules/jhipster-uaa/gateway/.prettierrc similarity index 100% rename from jhipster/jhipster-uaa/gateway/.prettierrc rename to jhipster-modules/jhipster-uaa/gateway/.prettierrc diff --git a/jhipster/jhipster-uaa/gateway/.yo-rc.json b/jhipster-modules/jhipster-uaa/gateway/.yo-rc.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/.yo-rc.json rename to jhipster-modules/jhipster-uaa/gateway/.yo-rc.json diff --git a/jhipster/jhipster-uaa/gateway/README.md b/jhipster-modules/jhipster-uaa/gateway/README.md similarity index 100% rename from jhipster/jhipster-uaa/gateway/README.md rename to jhipster-modules/jhipster-uaa/gateway/README.md diff --git a/jhipster/jhipster-uaa/gateway/angular.json b/jhipster-modules/jhipster-uaa/gateway/angular.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/angular.json rename to jhipster-modules/jhipster-uaa/gateway/angular.json diff --git a/jhipster/jhipster-uaa/gateway/mvnw b/jhipster-modules/jhipster-uaa/gateway/mvnw similarity index 100% rename from jhipster/jhipster-uaa/gateway/mvnw rename to jhipster-modules/jhipster-uaa/gateway/mvnw diff --git a/jhipster/jhipster-uaa/gateway/mvnw.cmd b/jhipster-modules/jhipster-uaa/gateway/mvnw.cmd similarity index 100% rename from jhipster/jhipster-uaa/gateway/mvnw.cmd rename to jhipster-modules/jhipster-uaa/gateway/mvnw.cmd diff --git a/jhipster/jhipster-uaa/gateway/package-lock.json b/jhipster-modules/jhipster-uaa/gateway/package-lock.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/package-lock.json rename to jhipster-modules/jhipster-uaa/gateway/package-lock.json diff --git a/jhipster/jhipster-uaa/gateway/package.json b/jhipster-modules/jhipster-uaa/gateway/package.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/package.json rename to jhipster-modules/jhipster-uaa/gateway/package.json diff --git a/jhipster/jhipster-uaa/gateway/pom.xml b/jhipster-modules/jhipster-uaa/gateway/pom.xml similarity index 100% rename from jhipster/jhipster-uaa/gateway/pom.xml rename to jhipster-modules/jhipster-uaa/gateway/pom.xml diff --git a/jhipster/jhipster-uaa/gateway/postcss.config.js b/jhipster-modules/jhipster-uaa/gateway/postcss.config.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/postcss.config.js rename to jhipster-modules/jhipster-uaa/gateway/postcss.config.js diff --git a/jhipster/jhipster-uaa/gateway/proxy.conf.json b/jhipster-modules/jhipster-uaa/gateway/proxy.conf.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/proxy.conf.json rename to jhipster-modules/jhipster-uaa/gateway/proxy.conf.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/.dockerignore similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/.dockerignore rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/.dockerignore diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/app.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/app.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/entrypoint.sh rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/entrypoint.sh diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-uaa/gateway/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/gateway/src/main/jib/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/jib/entrypoint.sh rename to jhipster-modules/jhipster-uaa/gateway/src/main/jib/entrypoint.sh diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/banner.txt rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/banner.txt diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12 similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12 rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12 diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/404.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/404.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/404.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/404.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/favicon.ico similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/favicon.ico rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/favicon.ico diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/index.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/index.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/index.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/index.html diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/manifest.webapp b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/manifest.webapp similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/manifest.webapp rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/manifest.webapp diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/robots.txt b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/robots.txt similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/robots.txt rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/robots.txt diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest.conf.js b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.conf.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest.conf.js rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.conf.js diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/logback.xml similarity index 100% rename from jhipster/jhipster-uaa/gateway/src/test/resources/logback.xml rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/logback.xml diff --git a/jhipster/jhipster-uaa/gateway/tsconfig-aot.json b/jhipster-modules/jhipster-uaa/gateway/tsconfig-aot.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/tsconfig-aot.json rename to jhipster-modules/jhipster-uaa/gateway/tsconfig-aot.json diff --git a/jhipster/jhipster-uaa/gateway/tsconfig.json b/jhipster-modules/jhipster-uaa/gateway/tsconfig.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/tsconfig.json rename to jhipster-modules/jhipster-uaa/gateway/tsconfig.json diff --git a/jhipster/jhipster-uaa/gateway/tslint.json b/jhipster-modules/jhipster-uaa/gateway/tslint.json similarity index 100% rename from jhipster/jhipster-uaa/gateway/tslint.json rename to jhipster-modules/jhipster-uaa/gateway/tslint.json diff --git a/jhipster/jhipster-uaa/gateway/webpack/logo-jhipster.png b/jhipster-modules/jhipster-uaa/gateway/webpack/logo-jhipster.png similarity index 100% rename from jhipster/jhipster-uaa/gateway/webpack/logo-jhipster.png rename to jhipster-modules/jhipster-uaa/gateway/webpack/logo-jhipster.png diff --git a/jhipster/jhipster-uaa/gateway/webpack/utils.js b/jhipster-modules/jhipster-uaa/gateway/webpack/utils.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/webpack/utils.js rename to jhipster-modules/jhipster-uaa/gateway/webpack/utils.js diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.common.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.common.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/webpack/webpack.common.js rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.common.js diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.dev.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.dev.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/webpack/webpack.dev.js rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.dev.js diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.prod.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.prod.js similarity index 100% rename from jhipster/jhipster-uaa/gateway/webpack/webpack.prod.js rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.prod.js diff --git a/jhipster/jhipster-uaa/pom.xml b/jhipster-modules/jhipster-uaa/pom.xml similarity index 100% rename from jhipster/jhipster-uaa/pom.xml rename to jhipster-modules/jhipster-uaa/pom.xml diff --git a/jhipster/jhipster-uaa/quotes/.editorconfig b/jhipster-modules/jhipster-uaa/quotes/.editorconfig similarity index 100% rename from jhipster/jhipster-uaa/quotes/.editorconfig rename to jhipster-modules/jhipster-uaa/quotes/.editorconfig diff --git a/jhipster/jhipster-uaa/quotes/.gitattributes b/jhipster-modules/jhipster-uaa/quotes/.gitattributes similarity index 100% rename from jhipster/jhipster-uaa/quotes/.gitattributes rename to jhipster-modules/jhipster-uaa/quotes/.gitattributes diff --git a/jhipster/jhipster-uaa/quotes/.gitignore b/jhipster-modules/jhipster-uaa/quotes/.gitignore similarity index 100% rename from jhipster/jhipster-uaa/quotes/.gitignore rename to jhipster-modules/jhipster-uaa/quotes/.gitignore diff --git a/jhipster/jhipster-uaa/quotes/.jhipster/Quote.json b/jhipster-modules/jhipster-uaa/quotes/.jhipster/Quote.json similarity index 100% rename from jhipster/jhipster-uaa/quotes/.jhipster/Quote.json rename to jhipster-modules/jhipster-uaa/quotes/.jhipster/Quote.json diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-uaa/quotes/.yo-rc.json b/jhipster-modules/jhipster-uaa/quotes/.yo-rc.json similarity index 100% rename from jhipster/jhipster-uaa/quotes/.yo-rc.json rename to jhipster-modules/jhipster-uaa/quotes/.yo-rc.json diff --git a/jhipster/jhipster-uaa/quotes/README.md b/jhipster-modules/jhipster-uaa/quotes/README.md similarity index 100% rename from jhipster/jhipster-uaa/quotes/README.md rename to jhipster-modules/jhipster-uaa/quotes/README.md diff --git a/jhipster/jhipster-uaa/quotes/mvnw b/jhipster-modules/jhipster-uaa/quotes/mvnw similarity index 100% rename from jhipster/jhipster-uaa/quotes/mvnw rename to jhipster-modules/jhipster-uaa/quotes/mvnw diff --git a/jhipster/jhipster-uaa/quotes/mvnw.cmd b/jhipster-modules/jhipster-uaa/quotes/mvnw.cmd similarity index 100% rename from jhipster/jhipster-uaa/quotes/mvnw.cmd rename to jhipster-modules/jhipster-uaa/quotes/mvnw.cmd diff --git a/jhipster/jhipster-uaa/quotes/package-lock.json b/jhipster-modules/jhipster-uaa/quotes/package-lock.json similarity index 100% rename from jhipster/jhipster-uaa/quotes/package-lock.json rename to jhipster-modules/jhipster-uaa/quotes/package-lock.json diff --git a/jhipster/jhipster-uaa/quotes/package.json b/jhipster-modules/jhipster-uaa/quotes/package.json similarity index 100% rename from jhipster/jhipster-uaa/quotes/package.json rename to jhipster-modules/jhipster-uaa/quotes/package.json diff --git a/jhipster/jhipster-uaa/quotes/pom.xml b/jhipster-modules/jhipster-uaa/quotes/pom.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/pom.xml rename to jhipster-modules/jhipster-uaa/quotes/pom.xml diff --git a/jhipster/jhipster-uaa/quotes/quotes.jh b/jhipster-modules/jhipster-uaa/quotes/quotes.jh similarity index 100% rename from jhipster/jhipster-uaa/quotes/quotes.jh rename to jhipster-modules/jhipster-uaa/quotes/quotes.jh diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/.dockerignore similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/.dockerignore rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/.dockerignore diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/app.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/app.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/entrypoint.sh rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/entrypoint.sh diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-uaa/quotes/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/quotes/src/main/jib/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/jib/entrypoint.sh rename to jhipster-modules/jhipster-uaa/quotes/src/main/jib/entrypoint.sh diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/banner.txt rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/banner.txt diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12 similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12 rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12 diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/static/index.html b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/static/index.html similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/static/index.html rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/static/index.html diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/logback.xml similarity index 100% rename from jhipster/jhipster-uaa/quotes/src/test/resources/logback.xml rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/logback.xml diff --git a/jhipster/jhipster-uaa/uaa/.editorconfig b/jhipster-modules/jhipster-uaa/uaa/.editorconfig similarity index 100% rename from jhipster/jhipster-uaa/uaa/.editorconfig rename to jhipster-modules/jhipster-uaa/uaa/.editorconfig diff --git a/jhipster/jhipster-uaa/uaa/.gitattributes b/jhipster-modules/jhipster-uaa/uaa/.gitattributes similarity index 100% rename from jhipster/jhipster-uaa/uaa/.gitattributes rename to jhipster-modules/jhipster-uaa/uaa/.gitattributes diff --git a/jhipster/jhipster-uaa/uaa/.gitignore b/jhipster-modules/jhipster-uaa/uaa/.gitignore similarity index 100% rename from jhipster/jhipster-uaa/uaa/.gitignore rename to jhipster-modules/jhipster-uaa/uaa/.gitignore diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties diff --git a/jhipster/jhipster-uaa/uaa/.yo-rc.json b/jhipster-modules/jhipster-uaa/uaa/.yo-rc.json similarity index 100% rename from jhipster/jhipster-uaa/uaa/.yo-rc.json rename to jhipster-modules/jhipster-uaa/uaa/.yo-rc.json diff --git a/jhipster/jhipster-uaa/uaa/README.md b/jhipster-modules/jhipster-uaa/uaa/README.md similarity index 100% rename from jhipster/jhipster-uaa/uaa/README.md rename to jhipster-modules/jhipster-uaa/uaa/README.md diff --git a/jhipster/jhipster-uaa/uaa/mvnw b/jhipster-modules/jhipster-uaa/uaa/mvnw similarity index 100% rename from jhipster/jhipster-uaa/uaa/mvnw rename to jhipster-modules/jhipster-uaa/uaa/mvnw diff --git a/jhipster/jhipster-uaa/uaa/mvnw.cmd b/jhipster-modules/jhipster-uaa/uaa/mvnw.cmd similarity index 100% rename from jhipster/jhipster-uaa/uaa/mvnw.cmd rename to jhipster-modules/jhipster-uaa/uaa/mvnw.cmd diff --git a/jhipster/jhipster-uaa/uaa/package-lock.json b/jhipster-modules/jhipster-uaa/uaa/package-lock.json similarity index 100% rename from jhipster/jhipster-uaa/uaa/package-lock.json rename to jhipster-modules/jhipster-uaa/uaa/package-lock.json diff --git a/jhipster/jhipster-uaa/uaa/package.json b/jhipster-modules/jhipster-uaa/uaa/package.json similarity index 100% rename from jhipster/jhipster-uaa/uaa/package.json rename to jhipster-modules/jhipster-uaa/uaa/package.json diff --git a/jhipster/jhipster-uaa/uaa/pom.xml b/jhipster-modules/jhipster-uaa/uaa/pom.xml similarity index 100% rename from jhipster/jhipster-uaa/uaa/pom.xml rename to jhipster-modules/jhipster-uaa/uaa/pom.xml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/.dockerignore similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/.dockerignore rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/.dockerignore diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/Dockerfile similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/Dockerfile rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/Dockerfile diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/app.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/app.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/app.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/entrypoint.sh rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/entrypoint.sh diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/mysql.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/mysql.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/mysql.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/sonar.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/docker/sonar.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/sonar.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java diff --git a/jhipster/jhipster-uaa/uaa/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/uaa/src/main/jib/entrypoint.sh similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/jib/entrypoint.sh rename to jhipster-modules/jhipster-uaa/uaa/src/main/jib/entrypoint.sh diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/.h2.server.properties similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/.h2.server.properties rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/.h2.server.properties diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/banner.txt similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/banner.txt rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/banner.txt diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12 similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12 rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12 diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/logback-spring.xml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/logback-spring.xml rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/logback-spring.xml diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/error.html similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/error.html rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/error.html diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/application.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/resources/config/application.yml rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/application.yml diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/logback.xml similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/resources/logback.xml rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/logback.xml diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html similarity index 100% rename from jhipster/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html diff --git a/jhipster/pom.xml b/jhipster-modules/pom.xml similarity index 100% rename from jhipster/pom.xml rename to jhipster-modules/pom.xml 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/libraries-data-io/src/main/resources/csv/namedColumn.csv b/libraries-data-io/src/main/resources/csv/namedColumn.csv new file mode 100644 index 0000000000..8929412e97 --- /dev/null +++ b/libraries-data-io/src/main/resources/csv/namedColumn.csv @@ -0,0 +1,4 @@ +name,Age +Joe,27 +Jane,32 +Bob,53 \ No newline at end of file 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/maven-modules/maven-properties/README.md b/maven-modules/maven-properties/README.md index 75ae24d215..a5c5d8c83f 100644 --- a/maven-modules/maven-properties/README.md +++ b/maven-modules/maven-properties/README.md @@ -7,3 +7,4 @@ have their own dedicated modules. - [Accessing Maven Properties in Java](https://www.baeldung.com/java-accessing-maven-properties) - [Default Values for Maven Properties](https://www.baeldung.com/maven-properties-defaults) +- [A Guide to Maven Encoding](https://www.baeldung.com/maven-encoding) diff --git a/maven-modules/maven-properties/pom.xml b/maven-modules/maven-properties/pom.xml index 88e13a0fb8..0e9986e3ac 100644 --- a/maven-modules/maven-properties/pom.xml +++ b/maven-modules/maven-properties/pom.xml @@ -19,7 +19,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + 1.1.0 generate-resources @@ -32,12 +32,37 @@ + + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + ${project.name} property-from-pom + + + + UTF-8 + UTF-8 \ No newline at end of file diff --git a/maven-modules/maven-properties/src/main/java/com/baeldung/maven/properties/NonAsciiString.java b/maven-modules/maven-properties/src/main/java/com/baeldung/maven/properties/NonAsciiString.java new file mode 100644 index 0000000000..48a82f93b0 --- /dev/null +++ b/maven-modules/maven-properties/src/main/java/com/baeldung/maven/properties/NonAsciiString.java @@ -0,0 +1,26 @@ +package com.baeldung.maven.properties; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/* + * Simple class to demonstrate the importance of Maven encoding when dealing with NonAscii characters + */ +public class NonAsciiString { + + private static final Logger LOGGER = LoggerFactory.getLogger(NonAsciiString.class); + + public static String getNonAsciiString() { + + String nonAsciiStr = "ÜÝÞßàæç"; + LOGGER.info(nonAsciiStr); + return nonAsciiStr; + + /*We can even use non-ASCII characters as Java variables names. + The below will run fine when built using Maven UTF-8 encoding, + but not when using US-ASCII. Give it a go!*/ + /*String nonAsciiŞŧř = "ÜÝÞßàæç"; + LOGGER.info(nonAsciiŞŧř); + return nonAsciiŞŧř;*/ + } +} diff --git a/maven-modules/maven-properties/src/test/java/com/baeldung/maven/properties/NonAsciiStringUnitTest.java b/maven-modules/maven-properties/src/test/java/com/baeldung/maven/properties/NonAsciiStringUnitTest.java new file mode 100644 index 0000000000..d6cc9908d3 --- /dev/null +++ b/maven-modules/maven-properties/src/test/java/com/baeldung/maven/properties/NonAsciiStringUnitTest.java @@ -0,0 +1,20 @@ +package com.baeldung.maven.properties; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class NonAsciiStringUnitTest { + + private static final Logger LOGGER = LoggerFactory.getLogger(NonAsciiStringUnitTest.class); + + /** + * Sanity check to ensure that the code is still able to compile and run + */ + @Test + public void whenNonAsciiStringIsUsed_thenCodeRuns() { + String nonAsciiStr = NonAsciiString.getNonAsciiString(); + LOGGER.info(nonAsciiStr); + } + +} diff --git a/core-java-modules/multimodulemavenproject/README.md b/maven-modules/multimodulemavenproject/README.md similarity index 100% rename from core-java-modules/multimodulemavenproject/README.md rename to maven-modules/multimodulemavenproject/README.md diff --git a/core-java-modules/multimodulemavenproject/daomodule/pom.xml b/maven-modules/multimodulemavenproject/daomodule/pom.xml similarity index 100% rename from core-java-modules/multimodulemavenproject/daomodule/pom.xml rename to maven-modules/multimodulemavenproject/daomodule/pom.xml diff --git a/core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java b/maven-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java similarity index 100% rename from core-java-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java rename to maven-modules/multimodulemavenproject/daomodule/src/main/java/com/baeldung/daomodule/Dao.java diff --git a/core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java b/maven-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java similarity index 100% rename from core-java-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java rename to maven-modules/multimodulemavenproject/daomodule/src/main/java/module-info.java diff --git a/core-java-modules/multimodulemavenproject/entitymodule/pom.xml b/maven-modules/multimodulemavenproject/entitymodule/pom.xml similarity index 100% rename from core-java-modules/multimodulemavenproject/entitymodule/pom.xml rename to maven-modules/multimodulemavenproject/entitymodule/pom.xml diff --git a/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java b/maven-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java similarity index 100% rename from core-java-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java rename to maven-modules/multimodulemavenproject/entitymodule/src/main/java/com/baeldung/entitymodule/User.java diff --git a/core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java b/maven-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java similarity index 100% rename from core-java-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java rename to maven-modules/multimodulemavenproject/entitymodule/src/main/java/module-info.java diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml b/maven-modules/multimodulemavenproject/mainappmodule/pom.xml similarity index 100% rename from core-java-modules/multimodulemavenproject/mainappmodule/pom.xml rename to maven-modules/multimodulemavenproject/mainappmodule/pom.xml diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java b/maven-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java similarity index 100% rename from core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java rename to maven-modules/multimodulemavenproject/mainappmodule/src/main/java/com/baeldung/mainappmodule/Application.java diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java b/maven-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java similarity index 100% rename from core-java-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java rename to maven-modules/multimodulemavenproject/mainappmodule/src/main/java/module-info.java diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/maven-modules/multimodulemavenproject/pom.xml similarity index 100% rename from core-java-modules/multimodulemavenproject/pom.xml rename to maven-modules/multimodulemavenproject/pom.xml diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml b/maven-modules/multimodulemavenproject/userdaomodule/pom.xml similarity index 100% rename from core-java-modules/multimodulemavenproject/userdaomodule/pom.xml rename to maven-modules/multimodulemavenproject/userdaomodule/pom.xml diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java b/maven-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java similarity index 100% rename from core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java rename to maven-modules/multimodulemavenproject/userdaomodule/src/main/java/com/baeldung/userdaomodule/UserDao.java diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java b/maven-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java similarity index 100% rename from core-java-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java rename to maven-modules/multimodulemavenproject/userdaomodule/src/main/java/module-info.java diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index 253f5d9fa0..99d7b3ed14 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -40,7 +40,7 @@ maven-surefire-plugin maven-parent-pom-resolution maven-simple - maven-classifier + maven-classifier diff --git a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/namingstrategy/CustomPhysicalNamingStrategy.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/namingstrategy/CustomPhysicalNamingStrategy.java index 74bcb9e411..d0cc6e8be6 100644 --- a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/namingstrategy/CustomPhysicalNamingStrategy.java +++ b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/namingstrategy/CustomPhysicalNamingStrategy.java @@ -41,7 +41,7 @@ public class CustomPhysicalNamingStrategy implements PhysicalNamingStrategy { final String newName = identifier.getText() .replaceAll(regex, replacement) .toLowerCase(); - return Identifier.toIdentifier(newName); + return Identifier.toIdentifier(newName, identifier.isQuoted()); } } diff --git a/persistence-modules/hibernate5/src/test/resources/hibernate-namingstrategy.properties b/persistence-modules/hibernate5/src/test/resources/hibernate-namingstrategy.properties index 263033823c..d0e068d13f 100644 --- a/persistence-modules/hibernate5/src/test/resources/hibernate-namingstrategy.properties +++ b/persistence-modules/hibernate5/src/test/resources/hibernate-namingstrategy.properties @@ -5,6 +5,7 @@ hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop +hibernate.globally_quoted_identifiers=true hibernate.physical_naming_strategy=com.baeldung.hibernate.namingstrategy.CustomPhysicalNamingStrategy hibernate.implicit_naming_strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index acfd171f3b..4637ab7ecc 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -87,6 +87,7 @@ spring-data-jdbc spring-data-keyvalue spring-data-mongodb + spring-data-mongodb-2 spring-data-mongodb-reactive spring-data-neo4j spring-data-redis diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/SpringBootCompositeKeyApplication.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/SpringBootCompositeKeyApplication.java new file mode 100644 index 0000000000..1322adbf77 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/SpringBootCompositeKeyApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.boot.composite.key; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; + +@SpringBootApplication +@EnableMongoRepositories(basePackages = { "com.baeldung.boot.composite.key" }) +public class SpringBootCompositeKeyApplication { + public static void main(String... args) { + SpringApplication.run(SpringBootCompositeKeyApplication.class, args); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/dao/TicketRepository.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/dao/TicketRepository.java new file mode 100644 index 0000000000..b02ea461d2 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/dao/TicketRepository.java @@ -0,0 +1,10 @@ +package com.baeldung.boot.composite.key.dao; + +import org.springframework.data.mongodb.repository.MongoRepository; + +import com.baeldung.boot.composite.key.data.Ticket; +import com.baeldung.boot.composite.key.data.TicketId; + +public interface TicketRepository extends MongoRepository { + +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/Ticket.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/Ticket.java new file mode 100644 index 0000000000..d77b54c513 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/Ticket.java @@ -0,0 +1,37 @@ +package com.baeldung.boot.composite.key.data; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +public class Ticket { + @Id + private TicketId id; + + private String event; + + public Ticket() { + } + + public Ticket(TicketId id, String event) { + super(); + this.id = id; + this.event = event; + } + + public TicketId getId() { + return id; + } + + public void setId(TicketId id) { + this.id = id; + } + + public String getEvent() { + return event; + } + + public void setEvent(String event) { + this.event = event; + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/TicketId.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/TicketId.java new file mode 100644 index 0000000000..76fbf81391 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/data/TicketId.java @@ -0,0 +1,56 @@ +package com.baeldung.boot.composite.key.data; + +public class TicketId { + private String venue; + private String date; + + public TicketId() { + } + + public String getVenue() { + return venue; + } + + public void setVenue(String venue) { + this.venue = venue; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((date == null) ? 0 : date.hashCode()); + result = prime * result + ((venue == null) ? 0 : venue.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; + TicketId other = (TicketId) obj; + if (date == null) { + if (other.date != null) + return false; + } else if (!date.equals(other.date)) + return false; + if (venue == null) { + if (other.venue != null) + return false; + } else if (!venue.equals(other.venue)) + return false; + return true; + } +} \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/service/CustomerService.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/service/CustomerService.java new file mode 100644 index 0000000000..90ca1b758d --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/service/CustomerService.java @@ -0,0 +1,28 @@ +package com.baeldung.boot.composite.key.service; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baeldung.boot.composite.key.dao.TicketRepository; +import com.baeldung.boot.composite.key.data.Ticket; +import com.baeldung.boot.composite.key.data.TicketId; + +@Service +public class CustomerService { + @Autowired + private TicketRepository ticketRepository; + + public Optional find(TicketId id) { + return ticketRepository.findById(id); + } + + public Ticket insert(Ticket ticket) { + return ticketRepository.insert(ticket); + } + + public Ticket save(Ticket ticket) { + return ticketRepository.save(ticket); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/web/CustomerController.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/web/CustomerController.java new file mode 100644 index 0000000000..4379a46d05 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/main/java/com/baeldung/boot/composite/key/web/CustomerController.java @@ -0,0 +1,37 @@ +package com.baeldung.boot.composite.key.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.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.composite.key.data.Ticket; +import com.baeldung.boot.composite.key.data.TicketId; +import com.baeldung.boot.composite.key.service.CustomerService; + +@RestController +@RequestMapping("/customer") +public class CustomerController { + @Autowired + private CustomerService customerService; + + @GetMapping("/ticket") + public Optional getTicket(TicketId id) { + return customerService.find(id); + } + + @PostMapping("/ticket") + public Ticket postTicket(@RequestBody Ticket ticket) { + return customerService.insert(ticket); + } + + @PutMapping("/ticket") + public Ticket putTicket(@RequestBody Ticket ticket) { + return customerService.save(ticket); + } +} diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/composite/key/CustomerServiceIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/composite/key/CustomerServiceIntegrationTest.java new file mode 100644 index 0000000000..af310ab29e --- /dev/null +++ b/persistence-modules/spring-boot-persistence-mongodb-2/src/test/java/com/baeldung/boot/composite/key/CustomerServiceIntegrationTest.java @@ -0,0 +1,84 @@ +package com.baeldung.boot.composite.key; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; + +import java.util.Optional; + +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.composite.key.data.Ticket; +import com.baeldung.boot.composite.key.data.TicketId; +import com.baeldung.boot.composite.key.service.CustomerService; + +@SpringBootTest +@DirtiesContext +@RunWith(SpringRunner.class) +public class CustomerServiceIntegrationTest { + @Autowired + private CustomerService service; + + @Test + public void givenCompositeId_whenObjectSaved_thenIdMatches() { + TicketId ticketId = new TicketId(); + ticketId.setDate("2020-01-01"); + ticketId.setVenue("Venue A"); + + Ticket ticket = new Ticket(ticketId, "Event A"); + Ticket savedTicket = service.insert(ticket); + + assertEquals(savedTicket.getId(), ticket.getId()); + } + + @Test + public void givenCompositeId_whenSearchingByIdObject_thenFound() { + TicketId ticketId = new TicketId(); + ticketId.setDate("2020-01-01"); + ticketId.setVenue("Venue B"); + + service.insert(new Ticket(ticketId, "Event B")); + + Optional optionalTicket = service.find(ticketId); + + assertThat(optionalTicket.isPresent()); + Ticket savedTicket = optionalTicket.get(); + + assertEquals(savedTicket.getId(), ticketId); + } + + @Test + public void givenCompositeId_whenDupeInsert_thenExceptionIsThrown() { + TicketId ticketId = new TicketId(); + ticketId.setDate("2020-01-01"); + ticketId.setVenue("V"); + + Ticket ticket = new Ticket(ticketId, "Event C"); + service.insert(ticket); + + assertThrows(DuplicateKeyException.class, () -> { + service.insert(ticket); + }); + } + + @Test + public void givenCompositeId_whenDupeSave_thenObjectUpdated() { + TicketId ticketId = new TicketId(); + ticketId.setDate("2020-01-01"); + ticketId.setVenue("Venue"); + + Ticket ticketA = new Ticket(ticketId, "A"); + service.save(ticketA); + + Ticket ticketB = new Ticket(ticketId, "B"); + Ticket savedTicket = service.save(ticketB); + + assertEquals(savedTicket.getEvent(), ticketB.getEvent()); + } +} diff --git a/persistence-modules/spring-data-mongodb-2/README.md b/persistence-modules/spring-data-mongodb-2/README.md new file mode 100644 index 0000000000..817da8d3cf --- /dev/null +++ b/persistence-modules/spring-data-mongodb-2/README.md @@ -0,0 +1,7 @@ +========= + +## Spring Data MongoDB 2 + +### Relevant Articles: +- [Return Only Specific Fields for a Query in Spring Data MongoDB](https://www.baeldung.com/mongodb-return-specific-fields) + diff --git a/persistence-modules/spring-data-mongodb-2/pom.xml b/persistence-modules/spring-data-mongodb-2/pom.xml new file mode 100644 index 0000000000..35353edfe3 --- /dev/null +++ b/persistence-modules/spring-data-mongodb-2/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + spring-data-mongodb-2 + spring-data-mongodb-2 + + + com.baeldung + parent-spring-5 + 0.0.1-SNAPSHOT + ../../parent-spring-5 + + + + + org.springframework.data + spring-data-mongodb + ${org.springframework.data.version} + + + org.mongodb + mongodb-driver-sync + ${mongodb-driver.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${spring.version} + test + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + ${embed.mongo.version} + test + + + + + 3.0.3.RELEASE + 4.0.5 + 3.2.6 + + + \ No newline at end of file diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/InStock.java b/persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/InStock.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/InStock.java rename to persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/InStock.java diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/Inventory.java b/persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/Inventory.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/Inventory.java rename to persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/Inventory.java diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/Size.java b/persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/Size.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/model/Size.java rename to persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/model/Size.java diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/repository/InventoryRepository.java b/persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/repository/InventoryRepository.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/projection/repository/InventoryRepository.java rename to persistence-modules/spring-data-mongodb-2/src/main/java/com/baeldung/projection/repository/InventoryRepository.java diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/AbstractTestProjection.java b/persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/AbstractTestProjection.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/AbstractTestProjection.java rename to persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/AbstractTestProjection.java diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/MongoTemplateProjectionUnitTest.java b/persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/MongoTemplateProjectionUnitTest.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/MongoTemplateProjectionUnitTest.java rename to persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/MongoTemplateProjectionUnitTest.java diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/RepositoryProjectionUnitTest.java b/persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/RepositoryProjectionUnitTest.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/RepositoryProjectionUnitTest.java rename to persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/RepositoryProjectionUnitTest.java diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/config/ProjectionConfig.java b/persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/config/ProjectionConfig.java similarity index 100% rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/projection/config/ProjectionConfig.java rename to persistence-modules/spring-data-mongodb-2/src/test/java/com/baeldung/projection/config/ProjectionConfig.java diff --git a/persistence-modules/spring-data-mongodb/README.md b/persistence-modules/spring-data-mongodb/README.md index 7dd0a82def..acc978c68e 100644 --- a/persistence-modules/spring-data-mongodb/README.md +++ b/persistence-modules/spring-data-mongodb/README.md @@ -11,7 +11,6 @@ - [Spring Data MongoDB: Projections and Aggregations](http://www.baeldung.com/spring-data-mongodb-projections-aggregations) - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations) - [Spring Data MongoDB Transactions](https://www.baeldung.com/spring-data-mongodb-transactions) -- [Return Only Specific Fields for a Query in Spring Data MongoDB](https://www.baeldung.com/mongodb-return-specific-fields) ## Spring Data MongoDB Live Testing diff --git a/pom.xml b/pom.xml index fccf6aafe7..4b96a48fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -365,7 +365,7 @@ bazel blade bootique - + cas cdi checker-plugin @@ -424,10 +424,6 @@ javafx java-jdi java-lite - java-numbers - java-numbers-2 - java-numbers-3 - java-numbers-4 java-rmi java-spi java-vavr-stream @@ -479,9 +475,7 @@ libraries-testing linkrest logging-modules - lombok - lombok-2 - lombok-custom + lombok-modules lucene mapstruct @@ -525,11 +519,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack @@ -586,16 +576,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 @@ -614,9 +597,7 @@ spring-caching-2 spring-cloud-modules - spring-cloud-bus - spring-cloud-data-flow spring-core spring-core-2 @@ -630,7 +611,7 @@ spring-di-3 spring-drools - spring-ejb + spring-ejb-modules spring-exceptions spring-freemarker @@ -652,13 +633,12 @@ spring-quartz spring-reactor - spring-remoting + spring-remoting-modules spring-roo spring-scheduling spring-security-modules spring-shell - spring-sleuth spring-soap spring-spel spring-state-machine @@ -684,7 +664,7 @@ twilio twitter4j - + undertow vertx vertx-and-rxjava @@ -740,7 +720,8 @@ image-processing jenkins/plugins - jhipster + jhipster-modules + jhipster-5 jws libraries @@ -749,7 +730,7 @@ libraries-6 spring-boot-modules/spring-boot-react - spring-ejb/ejb-beans + spring-ejb-modules/ejb-beans vaadin vavr @@ -824,7 +805,7 @@ bazel blade bootique - + cas cdi checker-plugin @@ -883,10 +864,6 @@ javafx java-jdi java-lite - java-numbers - java-numbers-2 - java-numbers-3 - java-numbers-4 java-rmi java-spi java-vavr-stream @@ -940,9 +917,7 @@ libraries-testing linkrest logging-modules - lombok - lombok-2 - lombok-custom + lombok-modules lucene mapstruct @@ -986,11 +961,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack @@ -1039,16 +1010,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 @@ -1067,9 +1032,7 @@ spring-caching-2 spring-cloud-modules - spring-cloud-bus - spring-cloud-data-flow spring-core spring-core-2 @@ -1083,7 +1046,7 @@ spring-di-3 spring-drools - spring-ejb + spring-ejb-modules spring-exceptions spring-freemarker @@ -1105,13 +1068,12 @@ spring-quartz spring-reactor - spring-remoting + spring-remoting-modules spring-roo spring-scheduling spring-security-modules spring-shell - spring-sleuth spring-soap spring-spel spring-state-machine @@ -1137,7 +1099,7 @@ twilio twitter4j - + undertow vertx vertx-and-rxjava @@ -1186,7 +1148,7 @@ image-processing jenkins/plugins - jhipster + jhipster-modules jhipster-5 jws @@ -1196,7 +1158,7 @@ libraries-6 spring-boot-modules/spring-boot-react - spring-ejb/ejb-beans + spring-ejb-modules/ejb-beans vaadin vavr @@ -1293,13 +1255,13 @@ core-java-modules/core-java-string-operations-4 core-java-modules/core-java-time-measurements core-java-modules/core-java-networking-3 - core-java-modules/multimodulemavenproject core-java-modules/core-java-strings core-java-modules/core-java-httpclient ddd-contexts docker-modules apache-httpclient-2 libraries-concurrency + maven-modules/multimodulemavenproject persistence-modules/sirix persistence-modules/spring-data-cassandra-2 quarkus-vs-springboot @@ -1362,12 +1324,12 @@ core-java-modules/core-java-string-operations-4 core-java-modules/core-java-time-measurements core-java-modules/core-java-networking-3 - core-java-modules/multimodulemavenproject core-java-modules/core-java-strings ddd-contexts docker-modules apache-httpclient-2 libraries-concurrency + maven-modules/multimodulemavenproject persistence-modules/sirix persistence-modules/spring-data-cassandra-2 quarkus-vs-springboot diff --git a/regexMatchesToArray/src/regex/array/RegexMatches.java b/regexMatchesToArray/src/regex/array/RegexMatches.java deleted file mode 100644 index d7b50d95ca..0000000000 --- a/regexMatchesToArray/src/regex/array/RegexMatches.java +++ /dev/null @@ -1,24 +0,0 @@ -package regex.array; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.*; - -class RegexMatches { - - String[] regexMatch(String strSearch) - { - List matchesList = new ArrayList(); - String stringToSearch = strSearch; - Pattern p1 = Pattern.compile("780{1}\\d{7}"); - Matcher m1 = p1.matcher(stringToSearch); - while (m1.find()) - { - matchesList.add(m1.group()); - } - int sizeOfNewArray = matchesList.size(); - String newArrayOfMatches[] = new String[sizeOfNewArray]; - matchesList.toArray(newArrayOfMatches); - return newArrayOfMatches; - } -} diff --git a/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java b/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java deleted file mode 100644 index 3e8f23c4bb..0000000000 --- a/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package regex.array; - -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; - -import regex.array.RegexMatches; - -class RegexMatchesUnitTest { - - @Test - void whenFourNums_thenFourMatches() { - RegexMatches rm = new RegexMatches(); - String actual[] = rm.regexMatch("7801111211fsdafasdfa 7802222222 sadfsadfsda7803333333 sadfdasfasd 7804444444"); - - assertArrayEquals(new String[] {"7801111211", "7802222222", "7803333333", "7804444444"}, actual, "success"); - } - - @Test - void whenThreeNums_thenThreeMatches() { - RegexMatches rm = new RegexMatches(); - String actual[] = rm.regexMatch("7801111211fsdafasdfa 780222222 sadfsadfsda7803333333 sadfdasfasd 7804444444"); - - assertArrayEquals(new String[] {"7801111211", "7803333333", "7804444444"}, actual, "success"); - } - - @Test - void whenZeroNums_thenZeroMatches() { - RegexMatches rm = new RegexMatches(); - String actual[] = rm.regexMatch("78011111fsdafasdfa 780222222 sadfsadfsda78033333 sadfdasfasd 7804444"); - - assertArrayEquals(new String[] {}, actual, "success"); - } -} diff --git a/rxjava-core/pom.xml b/rxjava-core/pom.xml deleted file mode 100644 index 89ea1bf7a2..0000000000 --- a/rxjava-core/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - rxjava-core - 1.0-SNAPSHOT - rxjava-core - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - - - com.jayway.awaitility - awaitility - ${awaitility.version} - - - - - 1.2.5 - 1.7.0 - 2.2.2 - - - \ No newline at end of file diff --git a/rxjava-operators/pom.xml b/rxjava-modules/pom.xml similarity index 73% rename from rxjava-operators/pom.xml rename to rxjava-modules/pom.xml index d833fb5d14..d43a65ed9c 100644 --- a/rxjava-operators/pom.xml +++ b/rxjava-modules/pom.xml @@ -3,9 +3,10 @@ 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 - rxjava-operators - 1.0-SNAPSHOT - rxjava-operators + com.baeldung.rxjava-modules + rxjava-modules + rxjava-modules + pom com.baeldung @@ -14,6 +15,13 @@ ../parent-java + + rxjava-core + rxjava-libraries + rxjava-observables + rxjava-operators + + io.reactivex @@ -25,11 +33,10 @@ rxjava ${rx.java2.version} - - com.github.akarnokd - rxjava2-extensions - ${rxjava2.ext.version} + io.reactivex + rxjava-string + ${rx.java.string.version} io.reactivex @@ -44,11 +51,11 @@ - 0.20.4 - 2.2.2 1.2.5 - 1.0.0 1.7.0 + 1.1.1 + 1.0.0 + 2.2.2 \ No newline at end of file diff --git a/rxjava-core/README.md b/rxjava-modules/rxjava-core/README.md similarity index 94% rename from rxjava-core/README.md rename to rxjava-modules/rxjava-core/README.md index 2773bd9423..148713c8e3 100644 --- a/rxjava-core/README.md +++ b/rxjava-modules/rxjava-core/README.md @@ -13,4 +13,3 @@ This module contains articles about RxJava. - [RxJava Maybe](https://www.baeldung.com/rxjava-maybe) - [Combining RxJava Completables](https://www.baeldung.com/rxjava-completable) - [RxJava Hooks](https://www.baeldung.com/rxjava-hooks) -- More articles: [[next -->]](/rxjava-2) diff --git a/rxjava-modules/rxjava-core/pom.xml b/rxjava-modules/rxjava-core/pom.xml new file mode 100644 index 0000000000..1ca940e501 --- /dev/null +++ b/rxjava-modules/rxjava-core/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + rxjava-core + 1.0-SNAPSHOT + rxjava-core + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java diff --git a/rxjava-core/src/main/resources/logback.xml b/rxjava-modules/rxjava-core/src/main/resources/logback.xml similarity index 100% rename from rxjava-core/src/main/resources/logback.xml rename to rxjava-modules/rxjava-core/src/main/resources/logback.xml diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java diff --git a/rxjava-libraries/README.md b/rxjava-modules/rxjava-libraries/README.md similarity index 100% rename from rxjava-libraries/README.md rename to rxjava-modules/rxjava-libraries/README.md diff --git a/rxjava-libraries/pom.xml b/rxjava-modules/rxjava-libraries/pom.xml similarity index 67% rename from rxjava-libraries/pom.xml rename to rxjava-modules/rxjava-libraries/pom.xml index f8df78d741..f5ccbd2d3c 100644 --- a/rxjava-libraries/pom.xml +++ b/rxjava-modules/rxjava-libraries/pom.xml @@ -8,23 +8,12 @@ rxjava-libraries - com.baeldung - parent-java + com.baeldung.rxjava-modules + rxjava-modules 0.0.1-SNAPSHOT - ../parent-java - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - com.jakewharton.rxrelay2 rxrelay @@ -45,9 +34,7 @@ 0.7.11 - 1.2.5 2.0.0 - 2.2.2 \ No newline at end of file diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java diff --git a/rxjava-libraries/src/test/resources/actual_clob b/rxjava-modules/rxjava-libraries/src/test/resources/actual_clob similarity index 100% rename from rxjava-libraries/src/test/resources/actual_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/actual_clob diff --git a/rxjava-libraries/src/test/resources/expected_clob b/rxjava-modules/rxjava-libraries/src/test/resources/expected_clob similarity index 100% rename from rxjava-libraries/src/test/resources/expected_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/expected_clob diff --git a/rxjava-observables/README.md b/rxjava-modules/rxjava-observables/README.md similarity index 100% rename from rxjava-observables/README.md rename to rxjava-modules/rxjava-observables/README.md diff --git a/rxjava-modules/rxjava-observables/pom.xml b/rxjava-modules/rxjava-observables/pom.xml new file mode 100644 index 0000000000..c54df19fa8 --- /dev/null +++ b/rxjava-modules/rxjava-observables/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + rxjava-observables + 1.0-SNAPSHOT + rxjava-observables + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java diff --git a/rxjava-operators/README.md b/rxjava-modules/rxjava-operators/README.md similarity index 100% rename from rxjava-operators/README.md rename to rxjava-modules/rxjava-operators/README.md diff --git a/rxjava-modules/rxjava-operators/pom.xml b/rxjava-modules/rxjava-operators/pom.xml new file mode 100644 index 0000000000..1859edc23b --- /dev/null +++ b/rxjava-modules/rxjava-operators/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + rxjava-operators + 1.0-SNAPSHOT + rxjava-operators + + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + + + + com.github.akarnokd + rxjava2-extensions + ${rxjava2.ext.version} + + + + + 0.20.4 + + \ No newline at end of file diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java diff --git a/rxjava-observables/pom.xml b/rxjava-observables/pom.xml deleted file mode 100644 index bcc3c4bbce..0000000000 --- a/rxjava-observables/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - rxjava-observables - 1.0-SNAPSHOT - rxjava-observables - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex - rxjava-string - ${rx.java.string.version} - - - - - 1.1.1 - 1.2.5 - - - \ No newline at end of file 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 89% rename from spring-5-reactive/README.md rename to spring-5-reactive-modules/spring-5-reactive/README.md index 0f4756c53e..05a748ca26 100644 --- a/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) 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-5-reactive-modules/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 new file mode 100644 index 0000000000..10d6cf4df7 --- /dev/null +++ b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingController.java @@ -0,0 +1,37 @@ +package com.baeldung.reactive.security; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; + +import java.security.Principal; + +@RestController +public class GreetingController { + + private final GreetingService greetingService; + + public GreetingController(GreetingService greetingService) { + this.greetingService = greetingService; + } + + @GetMapping("/") + public Mono greet(Mono principal) { + return principal + .map(Principal::getName) + .map(name -> String.format("Hello, %s", name)); + } + + @GetMapping("/admin") + public Mono greetAdmin(Mono principal) { + return principal + .map(Principal::getName) + .map(name -> String.format("Admin access: %s", name)); + } + + @GetMapping("/greetingService") + public Mono greetingService() { + return greetingService.greet(); + } + +} diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetService.java b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java similarity index 91% rename from spring-reactive/src/main/java/com/baeldung/reactive/security/GreetService.java rename to spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java index 93df64bced..b512f12bae 100644 --- a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetService.java +++ b/spring-5-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetingService.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; @Service -public class GreetService { +public class GreetingService { @PreAuthorize("hasRole('ADMIN')") public Mono greet() { 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 63% 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 index bb2f2d50e1..67e54ad26a 100644 --- 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 @@ -16,40 +16,37 @@ import org.springframework.security.web.server.SecurityWebFilterChain; public class SecurityConfig { @Bean - public SecurityWebFilterChain securitygWebFilterChain(ServerHttpSecurity http) { + public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { return http.authorizeExchange() - .pathMatchers("/admin") - .hasAuthority("ROLE_ADMIN") - .anyExchange() - .authenticated() - .and() - .formLogin() - .and() - .csrf() - .disable() - .build(); + .pathMatchers("/admin").hasAuthority("ROLE_ADMIN") + .anyExchange().authenticated() + .and() + .formLogin() + .and() + .csrf().disable() + .build(); } @Bean public MapReactiveUserDetailsService userDetailsService() { UserDetails user = User - .withUsername("user") - .password(passwordEncoder().encode("password")) - .roles("USER") - .build(); + .withUsername("user") + .password(passwordEncoder().encode("password")) + .roles("USER") + .build(); UserDetails admin = User - .withUsername("admin") - .password(passwordEncoder().encode("password")) - .roles("ADMIN") - .build(); + .withUsername("admin") + .password(passwordEncoder().encode("password")) + .roles("ADMIN") + .build(); return new MapReactiveUserDetailsService(user, admin); } - + @Bean public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); + return new BCryptPasswordEncoder(); } } 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 93% 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 index 3635844056..b03bfeb82d 100644 --- 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 @@ -19,18 +19,18 @@ import ch.qos.logback.classic.spi.IThrowableProxy; import reactor.core.publisher.Flux; import reactor.core.publisher.Hooks; -public class ConsumerFooServiceIntegrationTest { +class ConsumerFooServiceIntegrationTest { FooService service = new FooService(); @BeforeEach - public void clearLogList() { + void clearLogList() { Hooks.onOperatorDebug(); ListAppender.clearEventList(); } @Test - public void givenFooWithNullId_whenProcessFoo_thenLogsWithDebugTrace() { + void givenFooWithNullId_whenProcessFoo_thenLogsWithDebugTrace() { Foo one = new Foo(1, "nameverylong", 8); Foo two = new Foo(null, "nameverylong", 4); Flux flux = Flux.just(one, two); 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 86% 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 index 89e92f2818..84aee83c98 100644 --- 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 @@ -10,7 +10,7 @@ import org.springframework.test.web.reactive.server.WebTestClient.ResponseSpec; * - com.baeldung.reactive.debugging.server.ServerDebuggingApplication * - com.baeldung.reactive.debugging.consumer.ConsumerDebuggingApplication */ -public class ConsumerFooServiceLiveTest { +class ConsumerFooServiceLiveTest { private static final String BASE_URL = "http://localhost:8082"; private static final String DEBUG_HOOK_ON = BASE_URL + "/debug-hook-on"; @@ -19,14 +19,14 @@ public class ConsumerFooServiceLiveTest { private static WebTestClient client; @BeforeAll - public static void setup() { + static void setup() { client = WebTestClient.bindToServer() .baseUrl(BASE_URL) .build(); } @Test - public void whenRequestingDebugHookOn_thenObtainExpectedMessage() { + void whenRequestingDebugHookOn_thenObtainExpectedMessage() { ResponseSpec response = client.get() .uri(DEBUG_HOOK_ON) .exchange(); @@ -37,7 +37,7 @@ public class ConsumerFooServiceLiveTest { } @Test - public void whenRequestingDebugHookOff_thenObtainExpectedMessage() { + void whenRequestingDebugHookOff_thenObtainExpectedMessage() { ResponseSpec response = client.get() .uri(DEBUG_HOOK_OFF) .exchange(); 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 78% 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 index bbcab179eb..0068379d61 100644 --- 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 @@ -1,27 +1,24 @@ package com.baeldung.reactive.errorhandling; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext @AutoConfigureWebTestClient(timeout = "10000") -public class ErrorHandlingIntegrationTest { +class ErrorHandlingIntegrationTest { @Autowired private WebTestClient webTestClient; @Test - public void givenErrorReturn_whenUsernamePresent_thenOk() { + void givenErrorReturn_whenUsernamePresent_thenOk() { webTestClient.get() .uri("/api/endpoint1?name={username}", "Tony") @@ -31,7 +28,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenErrorReturn_whenNoUsername_thenOk() { + void givenErrorReturn_whenNoUsername_thenOk() { webTestClient.get() .uri("/api/endpoint1") @@ -41,7 +38,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeFallback_whenUsernamePresent_thenOk() { + void givenResumeFallback_whenUsernamePresent_thenOk() { webTestClient.get() .uri("/api/endpoint2?name={username}", "Tony") @@ -51,7 +48,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeFallback_whenNoUsername_thenOk() { + void givenResumeFallback_whenNoUsername_thenOk() { webTestClient.get() .uri("/api/endpoint2") @@ -61,7 +58,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeDynamicValue_whenUsernamePresent_thenOk() { + void givenResumeDynamicValue_whenUsernamePresent_thenOk() { webTestClient.get() .uri("/api/endpoint3?name={username}", "Tony") @@ -71,7 +68,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeDynamicValue_whenNoUsername_thenOk() { + void givenResumeDynamicValue_whenNoUsername_thenOk() { webTestClient.get() .uri("/api/endpoint3") @@ -81,7 +78,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeRethrow_whenUsernamePresent_thenOk() { + void givenResumeRethrow_whenUsernamePresent_thenOk() { webTestClient.get() .uri("/api/endpoint4?name={username}", "Tony") @@ -91,7 +88,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenResumeRethrow_whenNoUsername_thenOk() { + void givenResumeRethrow_whenNoUsername_thenOk() { webTestClient.get() .uri("/api/endpoint4") @@ -103,7 +100,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenGlobalErrorHandling_whenUsernamePresent_thenOk() { + void givenGlobalErrorHandling_whenUsernamePresent_thenOk() { webTestClient.get() .uri("/api/endpoint5?name={username}", "Tony") @@ -113,7 +110,7 @@ public class ErrorHandlingIntegrationTest { } @Test - public void givenGlobalErrorHandling_whenNoUsername_thenOk() { + void givenGlobalErrorHandling_whenNoUsername_thenOk() { webTestClient.get() .uri("/api/endpoint5") 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 88% 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 index 307cc2cfeb..63e49419ba 100644 --- 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 @@ -1,6 +1,6 @@ package com.baeldung.reactive.introduction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import org.slf4j.Logger; @@ -14,12 +14,12 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -public class ReactorIntegrationTest { +class ReactorIntegrationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ReactorIntegrationTest.class); - + @Test - public void givenFlux_whenSubscribing_thenStream() { + void givenFlux_whenSubscribing_thenStream() { List elements = new ArrayList<>(); @@ -35,7 +35,7 @@ public class ReactorIntegrationTest { } @Test - public void givenFlux_whenZipping_thenCombine() { + void givenFlux_whenZipping_thenCombine() { List elements = new ArrayList<>(); Flux.just(1, 2, 3, 4) @@ -52,7 +52,7 @@ public class ReactorIntegrationTest { } @Test - public void givenFlux_whenApplyingBackPressure_thenPushElementsInBatches() { + void givenFlux_whenApplyingBackPressure_thenPushElementsInBatches() { List elements = new ArrayList<>(); @@ -90,7 +90,7 @@ public class ReactorIntegrationTest { } @Test - public void givenFlux_whenInParallel_thenSubscribeInDifferentThreads() throws InterruptedException { + void givenFlux_whenInParallel_thenSubscribeInDifferentThreads() throws InterruptedException { List threadNames = new ArrayList<>(); Flux.just(1, 2, 3, 4) @@ -106,7 +106,7 @@ public class ReactorIntegrationTest { } @Test - public void givenConnectableFlux_whenConnected_thenShouldStream() { + void givenConnectableFlux_whenConnected_thenShouldStream() { List elements = new ArrayList<>(); diff --git a/spring-5-reactive-modules/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 new file mode 100644 index 0000000000..6bf39e4791 --- /dev/null +++ b/spring-5-reactive-modules/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java @@ -0,0 +1,43 @@ +package com.baeldung.reactive.security; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.web.reactive.server.WebTestClient; + +@SpringBootTest(classes = SpringSecurity5Application.class) +class SecurityIntegrationTest { + + @Autowired + private ApplicationContext context; + + private WebTestClient webTestClient; + + @BeforeEach + void setup() { + webTestClient = WebTestClient.bindToApplicationContext(context) + .configureClient() + .build(); + } + + @Test + void whenNoCredentials_thenRedirectToLogin() { + webTestClient.get() + .uri("/") + .exchange() + .expectStatus().is3xxRedirection(); + } + + @Test + @WithMockUser + void whenHasCredentials_thenSeesGreeting() { + webTestClient.get() + .uri("/") + .exchange() + .expectStatus().isOk() + .expectBody(String.class).isEqualTo("Hello, user"); + } +} 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 67% 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 index 4a1fc4390a..7cef90472c 100644 --- 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 @@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest(classes = WebClientApplication.class) -public class SpringContextTest { +class SpringContextTest { @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { + void whenSpringContextIsBootstrapped_thenNoExceptions() { } } 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 95% 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 index 22c545c362..f52a20b149 100644 --- 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 @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(classes = WebClientApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class WebClientIntegrationTest { +class WebClientIntegrationTest { private static final String BODY_VALUE = "bodyValue"; private static final ParameterizedTypeReference> MAP_RESPONSE_REF = new ParameterizedTypeReference>() { @@ -53,7 +53,7 @@ public class WebClientIntegrationTest { private int port; @Test - public void givenDifferentWebClientCreationMethods_whenUsed_thenObtainExpectedResponse() { + void givenDifferentWebClientCreationMethods_whenUsed_thenObtainExpectedResponse() { // WebClient creation WebClient client1 = WebClient.create(); WebClient client2 = WebClient.create("http://localhost:" + port); @@ -83,7 +83,7 @@ public class WebClientIntegrationTest { } @Test - public void givenDifferentMethodSpecifications_whenUsed_thenObtainExpectedResponse() { + void givenDifferentMethodSpecifications_whenUsed_thenObtainExpectedResponse() { // request specification RequestBodyUriSpec uriSpecPost1 = createDefaultClient().method(HttpMethod.POST); RequestBodyUriSpec uriSpecPost2 = createDefaultClient().post(); @@ -103,7 +103,7 @@ public class WebClientIntegrationTest { } @Test - public void givenDifferentUriSpecifications_whenUsed_thenObtainExpectedResponse() { + void givenDifferentUriSpecifications_whenUsed_thenObtainExpectedResponse() { // uri specification RequestBodySpec bodySpecUsingString = createDefaultPostRequest().uri("/resource"); RequestBodySpec bodySpecUsingUriBuilder = createDefaultPostRequest().uri( @@ -140,7 +140,7 @@ public class WebClientIntegrationTest { } @Test - public void givenDifferentBodySpecifications_whenUsed_thenObtainExpectedResponse() { + void givenDifferentBodySpecifications_whenUsed_thenObtainExpectedResponse() { // request body specifications RequestHeadersSpec headersSpecPost1 = createDefaultPostResourceRequest().body( BodyInserters.fromPublisher(Mono.just(BODY_VALUE), String.class)); @@ -194,7 +194,7 @@ public class WebClientIntegrationTest { } @Test - public void givenPostSpecifications_whenHeadersAdded_thenObtainExpectedResponse() { + void givenPostSpecifications_whenHeadersAdded_thenObtainExpectedResponse() { // request header specification RequestHeadersSpec headersSpecInserterStringWithHeaders = createDefaultPostResourceRequestResponse().header( HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) @@ -210,7 +210,7 @@ public class WebClientIntegrationTest { } @Test - public void givenDifferentResponseSpecifications_whenUsed_thenObtainExpectedResponse() { + void givenDifferentResponseSpecifications_whenUsed_thenObtainExpectedResponse() { ResponseSpec responseSpecPostString = createDefaultPostResourceRequestResponse().retrieve(); Mono responsePostString = responseSpecPostString.bodyToMono(String.class); Mono responsePostString2 = createDefaultPostResourceRequestResponse().exchangeToMono(response -> { @@ -255,7 +255,7 @@ public class WebClientIntegrationTest { } @Test - public void givenWebClientWithTimeoutConfigurations_whenRequestUsingWronglyConfiguredPublisher_thenObtainTimeout() { + void givenWebClientWithTimeoutConfigurations_whenRequestUsingWronglyConfiguredPublisher_thenObtainTimeout() { HttpClient httpClient = HttpClient.create() .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000) .responseTimeout(Duration.ofMillis(1000)) 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 97% 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 index 22bd2829d3..f4d2f4384f 100644 --- 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 @@ -13,7 +13,7 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFOR @DirtiesContext(classMode = BEFORE_CLASS) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = WebClientApplication.class) -public class WebControllerIntegrationTest { +class WebControllerIntegrationTest { @LocalServerPort private int randomServerPort; 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 87% 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 index dc2a2a30b9..6c7433dfe3 100644 --- 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 @@ -16,7 +16,7 @@ import org.springframework.web.server.WebHandler; import reactor.core.publisher.Mono; @SpringBootTest(classes = WebClientApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class WebTestClientIntegrationTest { +class WebTestClientIntegrationTest { @LocalServerPort private int port; @@ -28,7 +28,7 @@ public class WebTestClientIntegrationTest { private WebClientController controller; @Test - public void whenBindToWebHandler_thenRequestProcessed() { + void whenBindToWebHandler_thenRequestProcessed() { WebHandler webHandler = exchange -> Mono.empty(); WebTestClient.bindToWebHandler(webHandler) @@ -39,7 +39,7 @@ public class WebTestClientIntegrationTest { } @Test - public void whenBindToRouter_thenRequestProcessed() { + void whenBindToRouter_thenRequestProcessed() { RouterFunction routerFunction = RouterFunctions.route( RequestPredicates.GET("/resource"), request -> ServerResponse.ok().build() @@ -55,7 +55,7 @@ public class WebTestClientIntegrationTest { @Test @WithMockUser - public void whenBindToServer_thenRequestProcessed() { + void whenBindToServer_thenRequestProcessed() { WebTestClient.bindToServer() .baseUrl("http://localhost:" + port).build() .get().uri("/resource") @@ -66,7 +66,7 @@ public class WebTestClientIntegrationTest { @Test @WithMockUser - public void whenBindToApplicationContext_thenRequestProcessed() { + void whenBindToApplicationContext_thenRequestProcessed() { WebTestClient.bindToApplicationContext(context) .build() .get().uri("/resource") @@ -76,7 +76,7 @@ public class WebTestClientIntegrationTest { } @Test - public void whenBindToController_thenRequestProcessed() { + void whenBindToController_thenRequestProcessed() { WebTestClient.bindToController(controller) .build() .get().uri("/resource") 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 85% 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 index eefde078e1..3e09521e04 100644 --- 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 @@ -1,13 +1,11 @@ package com.baeldung.reactive.webclientrequests; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ExchangeFunction; @@ -15,15 +13,14 @@ import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -@RunWith(SpringRunner.class) @WebFluxTest -public class WebClientRequestsWithParametersUnitTest { +class WebClientRequestsWithParametersUnitTest { private static final String BASE_URL = "https://example.com"; @@ -35,8 +32,8 @@ public class WebClientRequestsWithParametersUnitTest { @Mock private ExchangeFunction exchangeFunction; - @Before - public void init() { + @BeforeEach + void init() { ClientResponse mockResponse = mock(ClientResponse.class); when(mockResponse.bodyToMono(String.class)).thenReturn(Mono.just("test")); when(exchangeFunction.exchange(argumentCaptor.capture())).thenReturn(Mono.just(mockResponse)); @@ -49,7 +46,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallSimpleURI_thenURIMatched() { + void whenCallSimpleURI_thenURIMatched() { webClient.get() .uri("/products") .retrieve() @@ -60,7 +57,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallSinglePathSegmentUri_thenURIMatched() { + void whenCallSinglePathSegmentUri_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/{id}") @@ -73,7 +70,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallMultiplePathSegmentsUri_thenURIMatched() { + void whenCallMultiplePathSegmentsUri_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/{id}/attributes/{attributeId}") @@ -86,7 +83,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallSingleQueryParams_thenURIMatched() { + void whenCallSingleQueryParams_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/") @@ -102,7 +99,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallSingleQueryParamsPlaceholders_thenURIMatched() { + void whenCallSingleQueryParamsPlaceholders_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/") @@ -118,7 +115,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallArrayQueryParamsBrackets_thenURIMatched() { + void whenCallArrayQueryParamsBrackets_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/") @@ -132,7 +129,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallArrayQueryParams_thenURIMatched() { + void whenCallArrayQueryParams_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/") @@ -146,7 +143,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenCallArrayQueryParamsComma_thenURIMatched() { + void whenCallArrayQueryParamsComma_thenURIMatched() { webClient.get() .uri(uriBuilder -> uriBuilder .path("/products/") @@ -160,7 +157,7 @@ public class WebClientRequestsWithParametersUnitTest { } @Test - public void whenUriComponentEncoding_thenQueryParamsNotEscaped() { + void whenUriComponentEncoding_thenQueryParamsNotEscaped() { DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(BASE_URL); factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.URI_COMPONENT); webClient = WebClient 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 85% 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 index 699bc9c154..5825b815c2 100644 --- 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 @@ -2,13 +2,11 @@ package com.baeldung.reactive.webflux.annotation; import com.baeldung.reactive.webflux.Employee; import com.baeldung.reactive.webflux.EmployeeRepository; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; 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.security.test.context.support.WithMockUser; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -21,9 +19,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT, classes = EmployeeSpringApplication.class) -public class EmployeeControllerIntegrationTest { +class EmployeeControllerIntegrationTest { @Autowired private WebTestClient testClient; @@ -32,7 +29,7 @@ public class EmployeeControllerIntegrationTest { private EmployeeRepository employeeRepository; @Test - public void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() { + void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() { Employee employee = new Employee("1", "Employee 1 Name"); @@ -46,7 +43,7 @@ public class EmployeeControllerIntegrationTest { } @Test - public void whenGetAllEmployees_thenCorrectEmployees() { + void whenGetAllEmployees_thenCorrectEmployees() { List employeeList = Arrays.asList( new Employee("1", "Employee 1 Name"), new Employee("2", "Employee 2 Name"), @@ -65,7 +62,7 @@ public class EmployeeControllerIntegrationTest { @Test @WithMockUser(username = "admin", roles = { "ADMIN" }) - public void givenValidUser_whenUpdateEmployee_thenEmployeeUpdated() { + void givenValidUser_whenUpdateEmployee_thenEmployeeUpdated() { Employee employee = new Employee("10", "Employee 10 Updated"); given(employeeRepository.updateEmployee(employee)).willReturn(Mono.just(employee)); @@ -82,7 +79,7 @@ public class EmployeeControllerIntegrationTest { @Test @WithMockUser - public void givenInvalidUser_whenUpdateEmployee_thenForbidden() { + void givenInvalidUser_whenUpdateEmployee_thenForbidden() { Employee employee = new Employee("10", "Employee 10 Updated"); testClient.post() 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 86% 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 index 5a54820e23..be2b64ae30 100644 --- 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 @@ -2,12 +2,10 @@ package com.baeldung.reactive.webflux.functional; import com.baeldung.reactive.webflux.Employee; import com.baeldung.reactive.webflux.EmployeeRepository; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; 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.context.junit4.SpringRunner; import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -19,9 +17,8 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT, classes = EmployeeSpringFunctionalApplication.class) -public class EmployeeSpringFunctionalIntegrationTest { +class EmployeeSpringFunctionalIntegrationTest { @Autowired private EmployeeFunctionalConfig config; @@ -30,7 +27,7 @@ public class EmployeeSpringFunctionalIntegrationTest { private EmployeeRepository employeeRepository; @Test - public void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() { + void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() { WebTestClient client = WebTestClient.bindToRouterFunction(config.getEmployeeByIdRoute()) .build(); @@ -48,7 +45,7 @@ public class EmployeeSpringFunctionalIntegrationTest { } @Test - public void whenGetAllEmployees_thenCorrectEmployees() { + void whenGetAllEmployees_thenCorrectEmployees() { WebTestClient client = WebTestClient.bindToRouterFunction(config.getAllEmployeesRoute()) .build(); @@ -67,7 +64,7 @@ public class EmployeeSpringFunctionalIntegrationTest { } @Test - public void whenUpdateEmployee_thenEmployeeUpdated() { + void whenUpdateEmployee_thenEmployeeUpdated() { WebTestClient client = WebTestClient.bindToRouterFunction(config.updateEmployeeRoute()) .build(); 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 diff --git a/spring-5/src/test/java/com/baeldung/Example1ManualTest.java b/spring-5/src/test/java/com/baeldung/Example1ManualTest.java deleted file mode 100644 index c3330b4213..0000000000 --- a/spring-5/src/test/java/com/baeldung/Example1ManualTest.java +++ /dev/null @@ -1,29 +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 -public class Example1ManualTest { - - @Test - public void test1a() { - block(3000); - } - - @Test - public void test1b() { - block(3000); - } - - public static void block(long ms) { - try { - Thread.sleep(ms); - } catch (InterruptedException e) { - System.out.println("Thread interrupted"); - } - } -} diff --git a/spring-5/src/test/java/com/baeldung/Example2ManualTest.java b/spring-5/src/test/java/com/baeldung/Example2ManualTest.java deleted file mode 100644 index 9c47b17fdb..0000000000 --- a/spring-5/src/test/java/com/baeldung/Example2ManualTest.java +++ /dev/null @@ -1,29 +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 -public class Example2ManualTest { - - @Test - public void test1a() { - block(3000); - } - - @Test - public void test1b() { - block(3000); - } - - public static void block(long ms) { - try { - Thread.sleep(ms); - } catch (InterruptedException e) { - System.out.println("Thread Interrupted"); - } - } -} diff --git a/spring-5/src/test/java/com/baeldung/ParallelManualTest.java b/spring-5/src/test/java/com/baeldung/ParallelManualTest.java deleted file mode 100644 index 5c3a111c62..0000000000 --- a/spring-5/src/test/java/com/baeldung/ParallelManualTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.experimental.ParallelComputer; -import org.junit.runner.Computer; -import org.junit.runner.JUnitCore; - -public class ParallelManualTest { - - @Test - public void runTests() { - final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; - - JUnitCore.runClasses(new Computer(), classes); - } - - @Test - public void runTestsInParallel() { - final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; - - JUnitCore.runClasses(new ParallelComputer(true, true), classes); - } - -} \ No newline at end of file diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java deleted file mode 100644 index b9ed87ed73..0000000000 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelManualTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.jupiter; - -import com.baeldung.Example1ManualTest; -import com.baeldung.Example2ManualTest; -import org.junit.experimental.ParallelComputer; -import org.junit.jupiter.api.Test; -import org.junit.runner.Computer; -import org.junit.runner.JUnitCore; - -class Spring5JUnit5ParallelManualTest { - - @Test - void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() { - final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; - - JUnitCore.runClasses(new ParallelComputer(true, true), classes); - } - - @Test - void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingLinear() { - final Class[] classes = { Example1ManualTest.class, Example2ManualTest.class }; - - JUnitCore.runClasses(new Computer(), classes); - } -} \ No newline at end of file diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 29685b0eb8..d0a35859b4 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -77,6 +77,7 @@ spring-boot-actuator spring-boot-data-2 spring-boot-validation + spring-boot-data-3 diff --git a/spring-boot-modules/spring-boot-data-3/README.md b/spring-boot-modules/spring-boot-data-3/README.md new file mode 100644 index 0000000000..7d843af9ea --- /dev/null +++ b/spring-boot-modules/spring-boot-data-3/README.md @@ -0,0 +1 @@ +### Relevant Articles: diff --git a/spring-boot-modules/spring-boot-data-3/pom.xml b/spring-boot-modules/spring-boot-data-3/pom.xml new file mode 100644 index 0000000000..a4fcd0c3f3 --- /dev/null +++ b/spring-boot-modules/spring-boot-data-3/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + com.baeldung.spring-boot-modules + spring-boot-modules + 1.0.0-SNAPSHOT + + com.baeldung + spring-boot-data-3 + 0.0.1-SNAPSHOT + spring-boot-data-3 + spring-boot-data-3 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + mysql + mysql-connector-java + runtime + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startwithoutdb/StartWithoutDbApplication.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startwithoutdb/StartWithoutDbApplication.java new file mode 100644 index 0000000000..6137113535 --- /dev/null +++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startwithoutdb/StartWithoutDbApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.startwithoutdb; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class StartWithoutDbApplication { + + public static void main(String[] args) { + SpringApplication.run(StartWithoutDbApplication.class, args); + } + +} diff --git a/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties b/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties new file mode 100644 index 0000000000..cbe044134f --- /dev/null +++ b/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties @@ -0,0 +1,7 @@ +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/myDb +spring.datasource.username=root +spring.datasource.password=root +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +spring.jpa.hibernate.ddl-auto=none +spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/startwithoutdb/StartWithoutDbIntegrationTest.java b/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/startwithoutdb/StartWithoutDbIntegrationTest.java new file mode 100644 index 0000000000..74d07848a0 --- /dev/null +++ b/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/startwithoutdb/StartWithoutDbIntegrationTest.java @@ -0,0 +1,24 @@ +package com.baeldung.startwithoutdb; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.sql.DataSource; + +@SpringBootTest(classes = StartWithoutDbApplication.class) +class StartWithoutDbIntegrationTest { + + @Autowired + private ApplicationContext context; + + @Test + public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() { + context.getBean(DataSource.class); + } + + +} diff --git a/spring-boot-modules/spring-boot-keycloak/README.md b/spring-boot-modules/spring-boot-keycloak/README.md index cde11df0fa..97a336c25c 100644 --- a/spring-boot-modules/spring-boot-keycloak/README.md +++ b/spring-boot-modules/spring-boot-keycloak/README.md @@ -10,3 +10,4 @@ This module contains articles about Keycloak in Spring Boot projects. - [Customizing Themes for Keycloak](https://www.baeldung.com/spring-keycloak-custom-themes) - [Securing SOAP Web Services With Keycloak](https://www.baeldung.com/soap-keycloak) - [Get Keycloak User ID in Spring](https://www.baeldung.com/spring-keycloak-get-user-id) +- [Disabling Keycloak Security in Spring Boot](https://www.baeldung.com/spring-keycloak-security-disable) diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/App.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/App.java new file mode 100644 index 0000000000..9655c80cc0 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/App.java @@ -0,0 +1,13 @@ +package com.baeldung.disablingkeycloak; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackages = { "com.baeldung.disablingkeycloak" }) +public class App { + + public static void main(String[] args) { + SpringApplication.run(App.class, args); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/DisableSecurityConfiguration.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/DisableSecurityConfiguration.java new file mode 100644 index 0000000000..619fd63662 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/DisableSecurityConfiguration.java @@ -0,0 +1,20 @@ +package com.baeldung.disablingkeycloak; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +@ConditionalOnProperty(name = "keycloak.enabled", havingValue = "false") +public class DisableSecurityConfiguration extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(final HttpSecurity http) throws Exception { + http.csrf() + .disable() + .authorizeRequests() + .anyRequest() + .permitAll(); + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java new file mode 100644 index 0000000000..a9a2ea6a18 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java @@ -0,0 +1,14 @@ +package com.baeldung.disablingkeycloak; + +import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class KeycloakConfiguration { + + @Bean + public KeycloakSpringBootConfigResolver keycloakConfigResolver() { + return new KeycloakSpringBootConfigResolver(); + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java new file mode 100644 index 0000000000..d48c99d8fd --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java @@ -0,0 +1,38 @@ +package com.baeldung.disablingkeycloak; + +import org.keycloak.adapters.springsecurity.KeycloakConfiguration; +import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.authentication.session.NullAuthenticatedSessionStrategy; +import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy; + +@KeycloakConfiguration +@ConditionalOnProperty(name = "keycloak.enabled", havingValue = "true", matchIfMissing = true) +public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter { + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) { + auth.authenticationProvider(keycloakAuthenticationProvider()); + } + + @Bean + @Override + protected SessionAuthenticationStrategy sessionAuthenticationStrategy() { + return new NullAuthenticatedSessionStrategy(); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + super.configure(http); + + http.csrf() + .disable() + .authorizeRequests() + .anyRequest() + .authenticated(); + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/User.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/User.java new file mode 100644 index 0000000000..78d4a9913a --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/User.java @@ -0,0 +1,40 @@ +package com.baeldung.disablingkeycloak; + +public class User { + private Long id; + private String firstname; + private String lastname; + + public User() { + } + + public User(Long id, String firstname, String lastname) { + this.id = id; + this.firstname = firstname; + this.lastname = lastname; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/UserController.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/UserController.java new file mode 100644 index 0000000000..19b429a78d --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/disablingkeycloak/UserController.java @@ -0,0 +1,17 @@ +package com.baeldung.disablingkeycloak; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/users") +public class UserController { + + @GetMapping("/{userId}") + public User getCustomer(@PathVariable Long userId) { + return new User(userId, "John", "Doe"); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-disabling-keycloak.properties b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-disabling-keycloak.properties new file mode 100644 index 0000000000..21263cf725 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-disabling-keycloak.properties @@ -0,0 +1,7 @@ +# Keycloak authentication is enabled for production. +keycloak.enabled=true +keycloak.realm=SpringBootKeycloak +keycloak.auth-server-url=http://localhost:8180/auth +keycloak.resource=login-app +keycloak.bearer-only=true +keycloak.ssl-required=external diff --git a/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/disablingkeycloak/DisablingKeycloakIntegrationTest.java b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/disablingkeycloak/DisablingKeycloakIntegrationTest.java new file mode 100644 index 0000000000..cf70f7e7c3 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/disablingkeycloak/DisablingKeycloakIntegrationTest.java @@ -0,0 +1,33 @@ +package com.baeldung.disablingkeycloak; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.apache.http.HttpStatus; +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.boot.test.web.client.TestRestTemplate; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = App.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@RunWith(SpringRunner.class) +@ActiveProfiles("disablingkeycloak") +public class DisablingKeycloakIntegrationTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void givenUnauthenticated_whenGettingUser_shouldReturnUser() { + ResponseEntity responseEntity = restTemplate.getForEntity("/users/1", User.class); + + assertEquals(HttpStatus.SC_OK, responseEntity.getStatusCodeValue()); + assertNotNull(responseEntity.getBody() + .getFirstname()); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-disablingkeycloak.properties b/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-disablingkeycloak.properties new file mode 100644 index 0000000000..db2c8fc59a --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-disablingkeycloak.properties @@ -0,0 +1 @@ +keycloak.enabled=false diff --git a/spring-boot-modules/spring-boot-libraries-2/README.md b/spring-boot-modules/spring-boot-libraries-2/README.md index 96f82cdf59..2031b76661 100644 --- a/spring-boot-modules/spring-boot-libraries-2/README.md +++ b/spring-boot-modules/spring-boot-libraries-2/README.md @@ -8,5 +8,6 @@ This module contains articles about various Spring Boot libraries - [Open API Server Implementation Using OpenAPI Generator](https://www.baeldung.com/java-openapi-generator-server) - [An Introduction to Kong](https://www.baeldung.com/kong) - [Getting Started With GraphQL SPQR and Spring Boot](https://www.baeldung.com/spring-boot-graphql-spqr) +- [How to Test GraphQL Using Postman](https://www.baeldung.com/graphql-postman) More articles: [[prev -->]](/spring-boot-modules/spring-boot-libraries) diff --git a/spring-boot-modules/spring-boot-springdoc/README.md b/spring-boot-modules/spring-boot-springdoc/README.md index 5daca79bd2..733e31e698 100644 --- a/spring-boot-modules/spring-boot-springdoc/README.md +++ b/spring-boot-modules/spring-boot-springdoc/README.md @@ -5,3 +5,4 @@ - [Hiding Endpoints From Swagger Documentation in Spring Boot](https://www.baeldung.com/spring-swagger-hiding-endpoints) - [Swagger @Api Description Is Deprecated](https://www.baeldung.com/java-swagger-api-description-deprecated) - [Set List of Objects in Swagger API Response](https://www.baeldung.com/java-swagger-set-list-response) +- [Configure JWT Authentication for OpenAPI](https://www.baeldung.com/openapi-jwt-authentication) diff --git a/spring-boot-modules/spring-boot-springdoc/pom.xml b/spring-boot-modules/spring-boot-springdoc/pom.xml index 88e616119d..18b1774920 100644 --- a/spring-boot-modules/spring-boot-springdoc/pom.xml +++ b/spring-boot-modules/spring-boot-springdoc/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 spring-boot-springdoc 0.0.1-SNAPSHOT @@ -112,6 +110,8 @@ application.properties data.sql schema.sql + app.key + app.pub diff --git a/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityConfiguration.java b/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityConfiguration.java index 6b42a8f1bb..8cb1ca1f60 100644 --- a/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityConfiguration.java +++ b/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityConfiguration.java @@ -52,8 +52,9 @@ public class SecurityConfiguration { //@formatter:off return http .authorizeHttpRequests(authorizeRequests -> authorizeRequests - .antMatchers("/api/auth/**", "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/webjars/**", - "/swagger-ui/index.html") + + .antMatchers("/api/auth/**", "/swagger-ui-custom.html" ,"/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/webjars/**", + "/swagger-ui/index.html","/api-docs/**") .permitAll() .anyRequest() .authenticated()) diff --git a/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityTokenApplication.java b/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityTokenApplication.java index 4c0c4f01d8..4e759c87e4 100644 --- a/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityTokenApplication.java +++ b/spring-boot-modules/spring-boot-springdoc/src/main/java/com/baeldung/jwt/SecurityTokenApplication.java @@ -11,7 +11,6 @@ public class SecurityTokenApplication { * @param args */ public static void main(String[] args) { - SpringApplication.run(SecurityTokenApplication.class, args); + SpringApplication.run(SecurityTokenApplication.class); } - } diff --git a/spring-boot-modules/spring-boot-springdoc/src/test/java/com/baeldung/jwt/OpenApiJwtIntegrationTest.java b/spring-boot-modules/spring-boot-springdoc/src/test/java/com/baeldung/jwt/OpenApiJwtIntegrationTest.java index 1ea88d14fa..a4920914fd 100644 --- a/spring-boot-modules/spring-boot-springdoc/src/test/java/com/baeldung/jwt/OpenApiJwtIntegrationTest.java +++ b/spring-boot-modules/spring-boot-springdoc/src/test/java/com/baeldung/jwt/OpenApiJwtIntegrationTest.java @@ -30,7 +30,7 @@ class OpenApiJwtIntegrationTest { assertNotNull(authenticationApi); - String response = this.restTemplate.getForObject("http://localhost:" + port + "/swagger-ui.html", String.class); + String response = this.restTemplate.getForObject("http://localhost:" + port + "/swagger-ui/index.html", String.class); assertNotNull(response); assertTrue(response.contains("Swagger UI")); @@ -43,8 +43,7 @@ class OpenApiJwtIntegrationTest { assertNotNull(authenticationApi); - ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/v3/api-docs", - String.class); + ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/api-docs", String.class); assertNotNull(response); assertEquals(HttpStatus.OK, response.getStatusCode()); @@ -59,8 +58,8 @@ class OpenApiJwtIntegrationTest { assertNotNull(authenticationApi); - ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/v3/api-docs", - String.class); + + ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/api-docs", String.class); assertNotNull(response); assertNotNull(response.getBody()); @@ -75,8 +74,7 @@ class OpenApiJwtIntegrationTest { assertNotNull(authenticationApi); - ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/v3/api-docs", - String.class); + ResponseEntity response = this.restTemplate.getForEntity("http://localhost:" + port + "/api-docs", String.class); assertNotNull(response); assertNotNull(response.getBody()); diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log deleted file mode 100644 index 92a8488c7d..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log +++ /dev/null @@ -1,2 +0,0 @@ -// dataflow 1.2.0.RELEASE log opened at 2016-10-20 13:13:20 -// dataflow 1.2.0.RELEASE log opened at 2016-10-24 16:51:17 diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml deleted file mode 100644 index 678ba1c6ac..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-cloud-data-flow-stream-processing - 0.0.1-SNAPSHOT - spring-cloud-data-flow-stream-processing - pom - - - com.baeldung - spring-cloud-data-flow - 0.0.1-SNAPSHOT - - - - data-flow-server - data-flow-shell - time-source - time-processor - log-sink - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - \ No newline at end of file diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml index d2f3845922..e725b366c6 100644 --- a/spring-cloud-modules/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -27,7 +27,7 @@ spring-cloud-zookeeper spring-cloud-gateway spring-cloud-stream - spring-cloud-stream-starters/twitterhdfs + spring-cloud-stream-starters spring-cloud-connectors-heroku spring-cloud-aws spring-cloud-consul @@ -50,6 +50,9 @@ spring-cloud-sentinel spring-cloud-dapr spring-cloud-docker + spring-cloud-bus + spring-cloud-data-flow + spring-cloud-sleuth @@ -92,4 +95,4 @@ 3.1.3 - \ No newline at end of file + diff --git a/spring-cloud-bus/README.md b/spring-cloud-modules/spring-cloud-bus/README.md similarity index 100% rename from spring-cloud-bus/README.md rename to spring-cloud-modules/spring-cloud-bus/README.md diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-modules/spring-cloud-bus/pom.xml similarity index 86% rename from spring-cloud-bus/pom.xml rename to spring-cloud-modules/spring-cloud-bus/pom.xml index 2eab7d52a9..4caba15ca9 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/pom.xml @@ -10,10 +10,9 @@ pom - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT diff --git a/spring-cloud-bus/spring-cloud-config-client/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml similarity index 96% rename from spring-cloud-bus/spring-cloud-config-client/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml index 28e7568266..87889570a3 100644 --- a/spring-cloud-bus/spring-cloud-config-client/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml @@ -1,54 +1,55 @@ - - - 4.0.0 - spring-cloud-config-client - spring-cloud-config-client - jar - Demo Spring Cloud Config Client - - - com.baeldung.spring.cloud - spring-cloud-bus - 1.0.0-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-actuator - - - org.springframework.boot - spring-boot-actuator-autoconfigure - - - org.springframework.cloud - spring-cloud-starter-bus-amqp - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + 4.0.0 + spring-cloud-config-client + spring-cloud-config-client + jar + Demo Spring Cloud Config Client + + + com.baeldung.spring.cloud + spring-cloud-bus + 1.0.0-SNAPSHOT + + + + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-actuator + + + org.springframework.boot + spring-boot-actuator-autoconfigure + + + org.springframework.cloud + spring-cloud-starter-bus-amqp + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml similarity index 90% rename from spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml index bb5c9607b8..e8bc5b9c5a 100644 --- a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml @@ -1,27 +1,27 @@ ---- -spring: - application: - name: config-client - profiles: - active: development - config: - import: configserver:http://root:s3cr3t@localhost:8888 - rabbitmq: - host: localhost - port: 5672 - username: guest - password: guest - cloud: - bus: - enabled: true - refresh: - enabled: true - config: - fail-fast: true -management: - endpoints: - web: - exposure: - include: "*" - security: +--- +spring: + application: + name: config-client + profiles: + active: development + config: + import: configserver:http://root:s3cr3t@localhost:8888 + rabbitmq: + host: localhost + port: 5672 + username: guest + password: guest + cloud: + bus: + enabled: true + refresh: + enabled: true + config: + fail-fast: true +management: + endpoints: + web: + exposure: + include: "*" + security: enabled: false \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml diff --git a/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-bus/spring-cloud-config-server/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml similarity index 96% rename from spring-cloud-bus/spring-cloud-config-server/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml index 03616b26af..e6439fa56a 100644 --- a/spring-cloud-bus/spring-cloud-config-server/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml @@ -1,50 +1,50 @@ - - - 4.0.0 - spring-cloud-config-server - spring-cloud-config-server - jar - Demo Spring Cloud Config Server - - - com.baeldung.spring.cloud - spring-cloud-bus - 1.0.0-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-config-server - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.cloud - spring-cloud-config-monitor - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + + 4.0.0 + spring-cloud-config-server + spring-cloud-config-server + jar + Demo Spring Cloud Config Server + + + com.baeldung.spring.cloud + spring-cloud-bus + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-config-server + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.cloud + spring-cloud-config-monitor + + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties similarity index 88% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties index 00ef9f0217..b27e14010e 100644 --- a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties @@ -1,14 +1,14 @@ -server.port=8888 -spring.cloud.config.server.git.uri= -spring.cloud.bus.enabled=true -spring.security.user.name=root -spring.security.user.password=s3cr3t -spring.rabbitmq.host=localhost -spring.rabbitmq.port=5672 -spring.rabbitmq.username=guest -spring.rabbitmq.password=guest - -encrypt.key-store.location=classpath:/config-server.jks -encrypt.key-store.password=my-s70r3-s3cr3t -encrypt.key-store.alias=config-server-key +server.port=8888 +spring.cloud.config.server.git.uri= +spring.cloud.bus.enabled=true +spring.security.user.name=root +spring.security.user.password=s3cr3t +spring.rabbitmq.host=localhost +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest + +encrypt.key-store.location=classpath:/config-server.jks +encrypt.key-store.password=my-s70r3-s3cr3t +encrypt.key-store.alias=config-server-key encrypt.key-store.secret=my-k34-s3cr3t \ No newline at end of file diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-cli/README.md b/spring-cloud-modules/spring-cloud-cli/README.md similarity index 100% rename from spring-cloud-cli/README.md rename to spring-cloud-modules/spring-cloud-cli/README.md diff --git a/spring-cloud-cli/decrypt.sh b/spring-cloud-modules/spring-cloud-cli/decrypt.sh similarity index 100% rename from spring-cloud-cli/decrypt.sh rename to spring-cloud-modules/spring-cloud-cli/decrypt.sh diff --git a/spring-cloud-cli/encrypt.sh b/spring-cloud-modules/spring-cloud-cli/encrypt.sh similarity index 100% rename from spring-cloud-cli/encrypt.sh rename to spring-cloud-modules/spring-cloud-cli/encrypt.sh diff --git a/spring-cloud-cli/groovy.sh b/spring-cloud-modules/spring-cloud-cli/groovy.sh similarity index 100% rename from spring-cloud-cli/groovy.sh rename to spring-cloud-modules/spring-cloud-cli/groovy.sh diff --git a/spring-cloud-cli/groovy/eureka.groovy b/spring-cloud-modules/spring-cloud-cli/groovy/eureka.groovy similarity index 100% rename from spring-cloud-cli/groovy/eureka.groovy rename to spring-cloud-modules/spring-cloud-cli/groovy/eureka.groovy diff --git a/spring-cloud-cli/groovy/restapi.groovy b/spring-cloud-modules/spring-cloud-cli/groovy/restapi.groovy similarity index 100% rename from spring-cloud-cli/groovy/restapi.groovy rename to spring-cloud-modules/spring-cloud-cli/groovy/restapi.groovy diff --git a/spring-cloud-cli/install.sh b/spring-cloud-modules/spring-cloud-cli/install.sh similarity index 100% rename from spring-cloud-cli/install.sh rename to spring-cloud-modules/spring-cloud-cli/install.sh diff --git a/spring-cloud-cli/spring-cli-cmds.sh b/spring-cloud-modules/spring-cloud-cli/spring-cli-cmds.sh similarity index 100% rename from spring-cloud-cli/spring-cli-cmds.sh rename to spring-cloud-modules/spring-cloud-cli/spring-cli-cmds.sh diff --git a/spring-cloud-cli/yml/configserver.yml b/spring-cloud-modules/spring-cloud-cli/yml/configserver.yml similarity index 100% rename from spring-cloud-cli/yml/configserver.yml rename to spring-cloud-modules/spring-cloud-cli/yml/configserver.yml diff --git a/spring-cloud-cli/yml/eureka.yml b/spring-cloud-modules/spring-cloud-cli/yml/eureka.yml similarity index 100% rename from spring-cloud-cli/yml/eureka.yml rename to spring-cloud-modules/spring-cloud-cli/yml/eureka.yml diff --git a/spring-cloud-data-flow/README.md b/spring-cloud-modules/spring-cloud-data-flow/README.md similarity index 100% rename from spring-cloud-data-flow/README.md rename to spring-cloud-modules/spring-cloud-data-flow/README.md diff --git a/spring-cloud-data-flow/apache-spark-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md similarity index 100% rename from spring-cloud-data-flow/apache-spark-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md diff --git a/spring-cloud-data-flow/apache-spark-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml similarity index 94% rename from spring-cloud-data-flow/apache-spark-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml index 4f2ef6cd6c..b2b0c7d68a 100644 --- a/spring-cloud-data-flow/apache-spark-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml @@ -7,7 +7,7 @@ apache-spark-job - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java b/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java similarity index 100% rename from spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java rename to spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java diff --git a/spring-cloud-data-flow/batch-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md similarity index 100% rename from spring-cloud-data-flow/batch-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md diff --git a/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml similarity index 96% rename from spring-cloud-data-flow/batch-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml index edb7e34389..627724a6be 100644 --- a/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml @@ -11,7 +11,7 @@ Demo project for Spring Boot - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java diff --git a/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java diff --git a/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/batch-job/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java diff --git a/spring-cloud-data-flow/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/pom.xml similarity index 76% rename from spring-cloud-data-flow/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/pom.xml index f81daeeabc..25a70642ec 100644 --- a/spring-cloud-data-flow/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/pom.xml @@ -1,25 +1,24 @@ - - - 4.0.0 - spring-cloud-data-flow - 0.0.1-SNAPSHOT - spring-cloud-data-flow - pom - - - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 - - - - spring-cloud-data-flow-stream-processing - spring-cloud-data-flow-etl - batch-job - apache-spark-job - - + + + 4.0.0 + spring-cloud-data-flow + 0.0.1-SNAPSHOT + spring-cloud-data-flow + pom + + + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT + + + + spring-cloud-data-flow-stream-processing + spring-cloud-data-flow-etl + batch-job + apache-spark-job + + \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/README.md diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml similarity index 97% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml index a2a9bf1980..3493e9a841 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml @@ -9,7 +9,7 @@ Example ETL Load Project - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow-etl 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/Customer.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerListener.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerMongodbSinkApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/java/com/customer/customermongodbsink/CustomerRepository.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml similarity index 96% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml index 067d25ec26..934cce1fdf 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml @@ -9,7 +9,7 @@ Example transform ETL step - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow-etl 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/Customer.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerProcessorConfiguration.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/java/com/customer/customertransform/CustomerTransformApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml similarity index 91% rename from spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml index ffdd153f15..17cc61d236 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/pom.xml @@ -9,7 +9,7 @@ pom - com.baeldung + com.baeldung.spring.cloud spring-cloud-data-flow 0.0.1-SNAPSHOT diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/README.md diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml similarity index 84% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml index 5dc8459e10..c521b77c4d 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml @@ -11,13 +11,19 @@ com.baeldung - parent-boot-1 + spring-cloud-data-flow-stream-processing 0.0.1-SNAPSHOT - ../../../parent-boot-1 + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.springframework.cloud spring-cloud-dataflow-dependencies @@ -62,6 +68,7 @@ 1.3.1.RELEASE Edgware.SR6 5.2.12.Final + 1.5.22.RELEASE \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/java/com/baeldung/spring/cloud/DataFlowServerApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 85% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java index d5b01c8b9c..7a5e4e695c 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/SpringContextTest.java @@ -11,6 +11,6 @@ import org.springframework.test.context.junit4.SpringRunner; public class SpringContextTest { @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { + public void contextLoads() { } } diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/resources/application.properties diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml similarity index 93% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml index 61c1b16581..5bf91a2c04 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/pom.xml @@ -11,9 +11,8 @@ com.baeldung - parent-boot-1 + spring-cloud-data-flow-stream-processing 0.0.1-SNAPSHOT - ../../../parent-boot-1 diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/java/com/baeldung/spring/cloud/DataFlowShellApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/java/com/baeldung/spring/cloud/LogSinkApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml new file mode 100644 index 0000000000..6e6367ecad --- /dev/null +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + com.baeldung + spring-cloud-data-flow-stream-processing + 0.0.1-SNAPSHOT + spring-cloud-data-flow-stream-processing + pom + + + com.baeldung.spring.cloud + spring-cloud-data-flow + 0.0.1-SNAPSHOT + + + + data-flow-server + data-flow-shell + time-source + time-processor + log-sink + + + + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + + + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + test + + + + + 1.3.1.RELEASE + Edgware.SR6 + 5.2.12.Final + 1.11.20 + 3.1.0 + + + + \ No newline at end of file diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/java/com/baeldung/spring/cloud/TimeProcessorApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/pom.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/java/com/baeldung/spring/cloud/TimeSourceApplication.java diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/main/resources/logback.xml diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml index cedd46dfef..98828a76f2 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml @@ -4,14 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 client-service - 1.0-SNAPSHOT client-service com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-guide + 1.0.0-SNAPSHOT @@ -88,4 +86,4 @@ 1.1.8.RELEASE - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml new file mode 100644 index 0000000000..ffd9097f2a --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-guide + kubernetes-guide + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + client-service + travel-agency-service + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml index ba5ba93682..1e93f7eaac 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml @@ -4,13 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 travel-agency-service - 1.0-SNAPSHOT + travel-agency-service com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-guide + 1.0.0-SNAPSHOT @@ -62,4 +61,4 @@ - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml index 81455eb259..2b3f849145 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml @@ -8,9 +8,8 @@ com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-minikube + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml index 558b2cfc3c..85eb944b27 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml @@ -8,9 +8,8 @@ com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-minikube + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml new file mode 100644 index 0000000000..4550750f58 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-minikube + kubernetes-minikube + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + demo-backend + demo-frontend + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml index 928f401405..3f93abdb69 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml @@ -4,14 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 liveness-example - 1.0-SNAPSHOT liveness-example com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-selfhealing + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml new file mode 100644 index 0000000000..ff49aa12d4 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-selfhealing + kubernetes-selfhealing + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + liveness-example + readiness-example + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml index b86c13d2f0..6b5b488834 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml @@ -4,14 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 readiness-example - 1.0-SNAPSHOT readiness-example com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-selfhealing + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml index 1131db150a..1bd1aaeebd 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml @@ -5,7 +5,6 @@ 4.0.0 com.baeldung.spring.cloud spring-cloud-kubernetes - 1.0-SNAPSHOT spring-cloud-kubernetes pom @@ -16,12 +15,9 @@ - kubernetes-minikube/demo-frontend - kubernetes-minikube/demo-backend - kubernetes-selfhealing/liveness-example - kubernetes-selfhealing/readiness-example - kubernetes-guide/client-service - kubernetes-guide/travel-agency-service + kubernetes-minikube + kubernetes-selfhealing + kubernetes-guide @@ -40,4 +36,4 @@ 2021.0.0 - \ No newline at end of file + diff --git a/spring-sleuth/README.md b/spring-cloud-modules/spring-cloud-sleuth/README.md similarity index 100% rename from spring-sleuth/README.md rename to spring-cloud-modules/spring-cloud-sleuth/README.md diff --git a/spring-sleuth/pom.xml b/spring-cloud-modules/spring-cloud-sleuth/pom.xml similarity index 81% rename from spring-sleuth/pom.xml rename to spring-cloud-modules/spring-cloud-sleuth/pom.xml index a6fba5ea56..14db7e02ea 100644 --- a/spring-sleuth/pom.xml +++ b/spring-cloud-modules/spring-cloud-sleuth/pom.xml @@ -3,16 +3,16 @@ 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-sleuth + spring-cloud-sleuth + com.baeldung.spring.cloud 1.0.0-SNAPSHOT - spring-sleuth + spring-cloud-sleuth jar - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT @@ -42,4 +42,4 @@ 3.1.0 - \ No newline at end of file + diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SchedulingService.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthController.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/SleuthWebApp.java diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java b/spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java similarity index 100% rename from spring-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java rename to spring-cloud-modules/spring-cloud-sleuth/src/main/java/com/baeldung/spring/session/ThreadConfig.java diff --git a/spring-sleuth/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-sleuth/src/main/resources/application.properties similarity index 100% rename from spring-sleuth/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-sleuth/src/main/resources/application.properties diff --git a/spring-sleuth/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-sleuth/src/main/resources/logback.xml similarity index 100% rename from spring-sleuth/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-sleuth/src/main/resources/logback.xml diff --git a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-sleuth/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-sleuth/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml new file mode 100644 index 0000000000..82252b3a55 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + com.baeldung.spring.cloud + spring-cloud-stream-starters + spring-cloud-stream-starters + pom + + + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT + + + + twitterhdfs + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud-dependencies.version} + pom + import + + + + + + 2021.0.0 + + + diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyComponent.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyComponent.java new file mode 100644 index 0000000000..2df3f1ee23 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyComponent.java @@ -0,0 +1,9 @@ +package com.baeldung.countingbeans.latestsspring; + +import org.springframework.stereotype.Component; + +@Component +@MyCustomAnnotation +public class MyComponent { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyConfigurationBean.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyConfigurationBean.java new file mode 100644 index 0000000000..c67a09356a --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyConfigurationBean.java @@ -0,0 +1,15 @@ +package com.baeldung.countingbeans.latestsspring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MyConfigurationBean { + + @Bean + @MyCustomAnnotation + MyService myService() { + return new MyService(); + } + +} diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyCustomAnnotation.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyCustomAnnotation.java new file mode 100644 index 0000000000..32edc3441c --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyCustomAnnotation.java @@ -0,0 +1,9 @@ +package com.baeldung.countingbeans.latestsspring; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention( RetentionPolicy.RUNTIME ) +public @interface MyCustomAnnotation { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyService.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyService.java new file mode 100644 index 0000000000..90b734a6c4 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/latestsspring/MyService.java @@ -0,0 +1,5 @@ +package com.baeldung.countingbeans.latestsspring; + +public class MyService { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansComponent.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansComponent.java new file mode 100644 index 0000000000..5828e8661d --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansComponent.java @@ -0,0 +1,19 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.stereotype.Component; + +@Component +public class AnnotatedBeansComponent { + + @Autowired + GenericApplicationContext applicationContext; + + public List getBeansWithAnnotation(Class annotationClass) { + return BeanUtils.getBeansWithAnnotation(applicationContext, annotationClass); + } + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/BeanUtils.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/BeanUtils.java new file mode 100644 index 0000000000..e5c642b974 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/BeanUtils.java @@ -0,0 +1,48 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.type.AnnotatedTypeMetadata; + +public class BeanUtils { + + // NB : this method lists only beans created via factory methods + public static List getBeansWithAnnotation(GenericApplicationContext applicationContext, Class annotationClass) { + List result = new ArrayList(); + ConfigurableListableBeanFactory factory = applicationContext.getBeanFactory(); + for(String name : factory.getBeanDefinitionNames()) { + BeanDefinition bd = factory.getBeanDefinition(name); + if(bd.getSource() instanceof AnnotatedTypeMetadata) { + AnnotatedTypeMetadata metadata = (AnnotatedTypeMetadata) bd.getSource(); + if (metadata.getAnnotationAttributes(annotationClass.getName()) != null) { + result.add(name); + } + } + } + return result; + } + + // NB : list beans created via factory methods using streams (same method as before, written differently) + public static List getBeansWithAnnotation_StreamVersion(GenericApplicationContext applicationContext, Class annotationClass) { + ConfigurableListableBeanFactory factory = applicationContext.getBeanFactory(); + return Arrays.stream(factory.getBeanDefinitionNames()) + .filter(name -> isAnnotated(factory, name, annotationClass)) + .collect(Collectors.toList()); + } + + private static boolean isAnnotated(ConfigurableListableBeanFactory factory, String beanName, Class clazz) { + BeanDefinition beanDefinition = factory.getBeanDefinition(beanName); + if(beanDefinition.getSource() instanceof AnnotatedTypeMetadata) { + AnnotatedTypeMetadata metadata = (AnnotatedTypeMetadata) beanDefinition.getSource(); + return metadata.getAnnotationAttributes(clazz.getName()) != null; + } + return false; + } + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyConfigurationBean.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyConfigurationBean.java new file mode 100644 index 0000000000..6937313c22 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyConfigurationBean.java @@ -0,0 +1,15 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MyConfigurationBean { + + @Bean + @MyCustomAnnotation + MyService myService() { + return new MyService(); + } + +} diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyCustomAnnotation.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyCustomAnnotation.java new file mode 100644 index 0000000000..36810adfd7 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyCustomAnnotation.java @@ -0,0 +1,9 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention( RetentionPolicy.RUNTIME ) +public @interface MyCustomAnnotation { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyService.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyService.java new file mode 100644 index 0000000000..35e42c0483 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/factorybeans/MyService.java @@ -0,0 +1,5 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +public class MyService { + +} diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyComponent.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyComponent.java new file mode 100644 index 0000000000..9e8329c374 --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyComponent.java @@ -0,0 +1,9 @@ +package com.baeldung.countingbeans.olderspring.qualifier; + +import org.springframework.stereotype.Component; + +@Component +@MyCustomAnnotation +public class MyComponent { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyConfigurationBean.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyConfigurationBean.java new file mode 100644 index 0000000000..4155e887bc --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyConfigurationBean.java @@ -0,0 +1,15 @@ +package com.baeldung.countingbeans.olderspring.qualifier; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MyConfigurationBean { + + @Bean + @MyCustomAnnotation + MyService myService() { + return new MyService(); + } + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyCustomAnnotation.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyCustomAnnotation.java new file mode 100644 index 0000000000..c81cc85c7f --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyCustomAnnotation.java @@ -0,0 +1,12 @@ +package com.baeldung.countingbeans.olderspring.qualifier; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import org.springframework.beans.factory.annotation.Qualifier; + +@Retention( RetentionPolicy.RUNTIME ) +@Qualifier +public @interface MyCustomAnnotation { + +} \ No newline at end of file diff --git a/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyService.java b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyService.java new file mode 100644 index 0000000000..d4e5c042ec --- /dev/null +++ b/spring-di-3/src/main/java/com/baeldung/countingbeans/olderspring/qualifier/MyService.java @@ -0,0 +1,5 @@ +package com.baeldung.countingbeans.olderspring.qualifier; + +public class MyService { + +} diff --git a/spring-di-3/src/test/java/com/baeldung/countingbeans/latestsspring/AnnotatedBeansIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/countingbeans/latestsspring/AnnotatedBeansIntegrationTest.java new file mode 100644 index 0000000000..8dc57b79e8 --- /dev/null +++ b/spring-di-3/src/test/java/com/baeldung/countingbeans/latestsspring/AnnotatedBeansIntegrationTest.java @@ -0,0 +1,28 @@ +package com.baeldung.countingbeans.latestsspring; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +public class AnnotatedBeansIntegrationTest { + + /** + * Note : this test fails with any spring version < 2.2 + * Before, the getBeansWithAnnotation method was not checking the beans created via factory method + * Please find the change here : https://github.com/spring-projects/spring-framework/commit/e0fe32af05ac525ef5e11c3ac5195a08759bb85e + */ + @Test + void whenApplicationContextStarted_ThenShouldDetectAllAnnotatedBeans() { + try (AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext( MyComponent.class, MyConfigurationBean.class )) { + Map beans = applicationContext.getBeansWithAnnotation(MyCustomAnnotation.class); + assertEquals(2, beans.size()); + assertTrue(beans.keySet().containsAll(Arrays.asList("myComponent", "myService"))); + } + } + +} \ No newline at end of file diff --git a/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansIntegrationTest.java new file mode 100644 index 0000000000..2d6ce324c1 --- /dev/null +++ b/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/factorybeans/AnnotatedBeansIntegrationTest.java @@ -0,0 +1,47 @@ +package com.baeldung.countingbeans.olderspring.factorybeans; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = {MyConfigurationBean.class, AnnotatedBeansComponent.class}) +public class AnnotatedBeansIntegrationTest { + + @Autowired + AnnotatedBeansComponent annotatedBeansComponent; + + @Test + void whenBeanUtilsGetBeansWithAnnotation_ThenShouldListAnnotatedBean() { + try (AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(MyConfigurationBean.class)) { + List result = BeanUtils.getBeansWithAnnotation(applicationContext, MyCustomAnnotation.class); + assertEquals(1, result.size()); + assertEquals("myService", result.get(0)); + } + } + + @Test + void whenBeanUtilsGetBeansWithAnnotationStreamVersion_ThenShouldListAnnotatedBean() { + try (AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(MyConfigurationBean.class)) { + List result = BeanUtils.getBeansWithAnnotation(applicationContext, MyCustomAnnotation.class); + assertEquals(1, result.size()); + assertEquals("myService", result.get(0)); + + } + } + + @Test + void whenAnnotatedBeansComponentGetBeansWithAnnotation_ThenShouldListAnnotatedBean() { + List result = annotatedBeansComponent.getBeansWithAnnotation(MyCustomAnnotation.class); + assertEquals(1, result.size()); + assertEquals("myService", result.get(0)); + } + +} \ No newline at end of file diff --git a/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/qualifier/AnnotatedBeansIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/qualifier/AnnotatedBeansIntegrationTest.java new file mode 100644 index 0000000000..0b2bb43061 --- /dev/null +++ b/spring-di-3/src/test/java/com/baeldung/countingbeans/olderspring/qualifier/AnnotatedBeansIntegrationTest.java @@ -0,0 +1,35 @@ +package com.baeldung.countingbeans.olderspring.qualifier; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = {MyComponent.class, MyConfigurationBean.class}) +public class AnnotatedBeansIntegrationTest { + + @Autowired + @MyCustomAnnotation + private List annotatedBeans; + + @Test + void whenAutowiring_ThenShouldDetectAllAnnotatedBeans() { + assertEquals(2, annotatedBeans.size()); + List classNames = annotatedBeans.stream() + .map(Object::getClass) + .map(Class::getName) + .map(s -> s.substring(s.lastIndexOf(".") + 1)) + .collect(Collectors.toList()); + assertTrue(classNames.containsAll(Arrays.asList("MyComponent", "MyService"))); + } + +} diff --git a/spring-ejb/README.md b/spring-ejb-modules/README.md similarity index 100% rename from spring-ejb/README.md rename to spring-ejb-modules/README.md diff --git a/spring-ejb/ejb-beans/README.md b/spring-ejb-modules/ejb-beans/README.md similarity index 100% rename from spring-ejb/ejb-beans/README.md rename to spring-ejb-modules/ejb-beans/README.md diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb-modules/ejb-beans/pom.xml similarity index 99% rename from spring-ejb/ejb-beans/pom.xml rename to spring-ejb-modules/ejb-beans/pom.xml index 37b67beec4..6bfbb42a14 100644 --- a/spring-ejb/ejb-beans/pom.xml +++ b/spring-ejb-modules/ejb-beans/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.ejb - spring-ejb + spring-ejb-modules 1.0.0-SNAPSHOT diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java diff --git a/spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java similarity index 100% rename from spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java rename to spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java diff --git a/spring-ejb/ejb-beans/src/main/resources/logback.xml b/spring-ejb-modules/ejb-beans/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/ejb-beans/src/main/resources/logback.xml rename to spring-ejb-modules/ejb-beans/src/main/resources/logback.xml diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java similarity index 100% rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java similarity index 100% rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java similarity index 100% rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java similarity index 100% rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java diff --git a/spring-ejb/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java similarity index 100% rename from spring-ejb/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java rename to spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java diff --git a/spring-ejb/ejb-beans/src/test/resources/arquillian.xml b/spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml similarity index 100% rename from spring-ejb/ejb-beans/src/test/resources/arquillian.xml rename to spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml diff --git a/spring-ejb/ejb-beans/src/test/resources/logging.properties b/spring-ejb-modules/ejb-beans/src/test/resources/logging.properties similarity index 100% rename from spring-ejb/ejb-beans/src/test/resources/logging.properties rename to spring-ejb-modules/ejb-beans/src/test/resources/logging.properties diff --git a/spring-ejb/pom.xml b/spring-ejb-modules/pom.xml similarity index 96% rename from spring-ejb/pom.xml rename to spring-ejb-modules/pom.xml index 896df6e8d8..9a4bfa2823 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb-modules/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.spring.ejb - spring-ejb + spring-ejb-modules 1.0.0-SNAPSHOT - spring-ejb + spring-ejb-modules pom Spring EJB Tutorial @@ -24,7 +24,7 @@ - junit @@ -93,4 +93,4 @@ 3.2 - \ No newline at end of file + diff --git a/spring-ejb/spring-ejb-client/README.md b/spring-ejb-modules/spring-ejb-client/README.md similarity index 100% rename from spring-ejb/spring-ejb-client/README.md rename to spring-ejb-modules/spring-ejb-client/README.md diff --git a/spring-ejb/spring-ejb-client/pom.xml b/spring-ejb-modules/spring-ejb-client/pom.xml similarity index 97% rename from spring-ejb/spring-ejb-client/pom.xml rename to spring-ejb-modules/spring-ejb-client/pom.xml index ecf9d0eb49..b3a65db32b 100644 --- a/spring-ejb/spring-ejb-client/pom.xml +++ b/spring-ejb-modules/spring-ejb-client/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.ejb - spring-ejb + spring-ejb-modules 1.0.0-SNAPSHOT diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java rename to spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java diff --git a/spring-ejb/spring-ejb-client/src/main/resources/application.properties b/spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/resources/application.properties rename to spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties diff --git a/spring-ejb/spring-ejb-client/src/main/resources/jboss-ejb-client.properties b/spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/resources/jboss-ejb-client.properties rename to spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties diff --git a/spring-ejb/spring-ejb-client/src/main/resources/logback.xml b/spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/spring-ejb-client/src/main/resources/logback.xml rename to spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java similarity index 100% rename from spring-ejb/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java rename to spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java diff --git a/spring-ejb/spring-ejb-remote/README.md b/spring-ejb-modules/spring-ejb-remote/README.md similarity index 100% rename from spring-ejb/spring-ejb-remote/README.md rename to spring-ejb-modules/spring-ejb-remote/README.md diff --git a/spring-ejb/spring-ejb-remote/pom.xml b/spring-ejb-modules/spring-ejb-remote/pom.xml similarity index 98% rename from spring-ejb/spring-ejb-remote/pom.xml rename to spring-ejb-modules/spring-ejb-remote/pom.xml index a180955dcf..4a40c497e9 100644 --- a/spring-ejb/spring-ejb-remote/pom.xml +++ b/spring-ejb-modules/spring-ejb-remote/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.ejb - spring-ejb + spring-ejb-modules 1.0.0-SNAPSHOT diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java diff --git a/spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java rename to spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java diff --git a/spring-ejb/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml b/spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml rename to spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml diff --git a/spring-ejb/spring-ejb-remote/src/main/resources/logback.xml b/spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/spring-ejb-remote/src/main/resources/logback.xml rename to spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml diff --git a/spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java rename to spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java diff --git a/spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java similarity index 100% rename from spring-ejb/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java rename to spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java diff --git a/spring-ejb/wildfly/pom.xml b/spring-ejb-modules/wildfly/pom.xml similarity index 98% rename from spring-ejb/wildfly/pom.xml rename to spring-ejb-modules/wildfly/pom.xml index 8a6d41ea82..c73a1f128d 100644 --- a/spring-ejb/wildfly/pom.xml +++ b/spring-ejb-modules/wildfly/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.ejb - spring-ejb + spring-ejb-modules 1.0.0-SNAPSHOT diff --git a/spring-ejb/wildfly/widlfly-web/pom.xml b/spring-ejb-modules/wildfly/widlfly-web/pom.xml similarity index 100% rename from spring-ejb/wildfly/widlfly-web/pom.xml rename to spring-ejb-modules/wildfly/widlfly-web/pom.xml diff --git a/spring-ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java similarity index 100% rename from spring-ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java rename to spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java diff --git a/spring-ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java similarity index 100% rename from spring-ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java rename to spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java diff --git a/spring-ejb/wildfly/widlfly-web/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/wildfly/widlfly-web/src/main/resources/logback.xml rename to spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml diff --git a/spring-ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml b/spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml rename to spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml diff --git a/spring-ejb/wildfly/wildfly-ear/pom.xml b/spring-ejb-modules/wildfly/wildfly-ear/pom.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-ear/pom.xml rename to spring-ejb-modules/wildfly/wildfly-ear/pom.xml diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/pom.xml b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb-interfaces/pom.xml rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java diff --git a/spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml rename to spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml diff --git a/spring-ejb/wildfly/wildfly-ejb/pom.xml b/spring-ejb-modules/wildfly/wildfly-ejb/pom.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb/pom.xml rename to spring-ejb-modules/wildfly/wildfly-ejb/pom.xml diff --git a/spring-ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java rename to spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java diff --git a/spring-ejb/wildfly/wildfly-ejb/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-ejb/src/main/resources/logback.xml rename to spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml diff --git a/spring-ejb/wildfly/wildfly-jpa/pom.xml b/spring-ejb-modules/wildfly/wildfly-jpa/pom.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-jpa/pom.xml rename to spring-ejb-modules/wildfly/wildfly-jpa/pom.xml diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/java/model/User.java b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java similarity index 100% rename from spring-ejb/wildfly/wildfly-jpa/src/main/java/model/User.java rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/data.sql b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql similarity index 100% rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/data.sql rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql diff --git a/spring-ejb/wildfly/wildfly-jpa/src/main/resources/logback.xml b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-jpa/src/main/resources/logback.xml rename to spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml diff --git a/spring-ejb/wildfly/wildfly-mdb/pom.xml b/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml similarity index 100% rename from spring-ejb/wildfly/wildfly-mdb/pom.xml rename to spring-ejb-modules/wildfly/wildfly-mdb/pom.xml diff --git a/spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java similarity index 100% rename from spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java rename to spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java diff --git a/spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java similarity index 100% rename from spring-ejb/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java rename to spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java diff --git a/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaConsumer.java b/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaConsumer.java index 48a194b4e3..796bab7d32 100644 --- a/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaConsumer.java +++ b/spring-kafka/src/main/java/com/baeldung/kafka/embedded/KafkaConsumer.java @@ -15,12 +15,14 @@ public class KafkaConsumer { private static final Logger LOGGER = LoggerFactory.getLogger(KafkaConsumer.class); private CountDownLatch latch = new CountDownLatch(1); - private String payload = null; + + private String payload; @KafkaListener(topics = "${test.topic}") public void receive(ConsumerRecord consumerRecord) { LOGGER.info("received payload='{}'", consumerRecord.toString()); - setPayload(consumerRecord.toString()); + + payload = consumerRecord.toString(); latch.countDown(); } @@ -28,12 +30,12 @@ public class KafkaConsumer { return latch; } + public void resetLatch() { + latch = new CountDownLatch(1); + } + public String getPayload() { return payload; } - private void setPayload(String payload) { - this.payload = payload; - } - } diff --git a/spring-kafka/src/test/java/com/baeldung/kafka/embedded/EmbeddedKafkaIntegrationTest.java b/spring-kafka/src/test/java/com/baeldung/kafka/embedded/EmbeddedKafkaIntegrationTest.java index 4c727795c4..eebcf778be 100644 --- a/spring-kafka/src/test/java/com/baeldung/kafka/embedded/EmbeddedKafkaIntegrationTest.java +++ b/spring-kafka/src/test/java/com/baeldung/kafka/embedded/EmbeddedKafkaIntegrationTest.java @@ -3,9 +3,11 @@ package com.baeldung.kafka.embedded; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -31,22 +33,31 @@ class EmbeddedKafkaIntegrationTest { @Value("${test.topic}") private String topic; - @Test - public void givenEmbeddedKafkaBroker_whenSendingtoDefaultTemplate_thenMessageReceived() throws Exception { - template.send(topic, "Sending with default template"); - consumer.getLatch().await(10000, TimeUnit.MILLISECONDS); - assertThat(consumer.getLatch().getCount(), equalTo(0L)); - - assertThat(consumer.getPayload(), containsString("embedded-test-topic")); + @BeforeEach + void setup() { + consumer.resetLatch(); } @Test - public void givenEmbeddedKafkaBroker_whenSendingtoSimpleProducer_thenMessageReceived() throws Exception { - producer.send(topic, "Sending with our own simple KafkaProducer"); - consumer.getLatch().await(10000, TimeUnit.MILLISECONDS); - - assertThat(consumer.getLatch().getCount(), equalTo(0L)); - assertThat(consumer.getPayload(), containsString("embedded-test-topic")); + public void givenEmbeddedKafkaBroker_whenSendingWithDefaultTemplate_thenMessageReceived() throws Exception { + String data = "Sending with default template"; + + template.send(topic, data); + + boolean messageConsumed = consumer.getLatch().await(10, TimeUnit.SECONDS); + assertTrue(messageConsumed); + assertThat(consumer.getPayload(), containsString(data)); + } + + @Test + public void givenEmbeddedKafkaBroker_whenSendingWithSimpleProducer_thenMessageReceived() throws Exception { + String data = "Sending with our own simple KafkaProducer"; + + producer.send(topic, data); + + boolean messageConsumed = consumer.getLatch().await(10, TimeUnit.SECONDS); + assertTrue(messageConsumed); + assertThat(consumer.getPayload(), containsString(data)); } } diff --git a/spring-kafka/src/test/java/com/baeldung/kafka/testcontainers/KafkaTestContainersLiveTest.java b/spring-kafka/src/test/java/com/baeldung/kafka/testcontainers/KafkaTestContainersLiveTest.java index 74d6f824b1..a111c4a5bc 100644 --- a/spring-kafka/src/test/java/com/baeldung/kafka/testcontainers/KafkaTestContainersLiveTest.java +++ b/spring-kafka/src/test/java/com/baeldung/kafka/testcontainers/KafkaTestContainersLiveTest.java @@ -3,6 +3,7 @@ package com.baeldung.kafka.testcontainers; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; import java.util.Map; @@ -12,6 +13,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,9 +39,9 @@ import com.baeldung.kafka.embedded.KafkaProducer; import com.baeldung.kafka.embedded.KafkaProducerConsumerApplication; /** - * This test class uses Testcontainers to instantiate and manage an external Apache + * This test class uses Testcontainers to instantiate and manage an external Apache * Kafka broker hosted inside a Docker container. - * + * * Therefore, one of the prerequisites for using Testcontainers is that Docker is installed on the host running this test * */ @@ -64,22 +66,31 @@ public class KafkaTestContainersLiveTest { @Value("${test.topic}") private String topic; - @Test - public void givenKafkaDockerContainer_whenSendingtoDefaultTemplate_thenMessageReceived() throws Exception { - template.send(topic, "Sending with default template"); - consumer.getLatch().await(10000, TimeUnit.MILLISECONDS); - - assertThat(consumer.getLatch().getCount(), equalTo(0L)); - assertThat(consumer.getPayload(), containsString("embedded-test-topic")); + @Before + public void setup() { + consumer.resetLatch(); } @Test - public void givenKafkaDockerContainer_whenSendingtoSimpleProducer_thenMessageReceived() throws Exception { - producer.send(topic, "Sending with own controller"); - consumer.getLatch().await(10000, TimeUnit.MILLISECONDS); - - assertThat(consumer.getLatch().getCount(), equalTo(0L)); - assertThat(consumer.getPayload(), containsString("embedded-test-topic")); + public void givenKafkaDockerContainer_whenSendingWithDefaultTemplate_thenMessageReceived() throws Exception { + String data = "Sending with default template"; + + template.send(topic, data); + + boolean messageConsumed = consumer.getLatch().await(10, TimeUnit.SECONDS); + assertTrue(messageConsumed); + assertThat(consumer.getPayload(), containsString(data)); + } + + @Test + public void givenKafkaDockerContainer_whenSendingWithSimpleProducer_thenMessageReceived() throws Exception { + String data = "Sending with our own simple KafkaProducer"; + + producer.send(topic, data); + + boolean messageConsumed = consumer.getLatch().await(10, TimeUnit.SECONDS); + assertTrue(messageConsumed); + assertThat(consumer.getPayload(), containsString(data)); } @TestConfiguration diff --git a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java b/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java deleted file mode 100644 index 99b79d88ea..0000000000 --- a/spring-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.reactive.security; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -import java.security.Principal; - -@RestController -public class GreetController { - - private GreetService greetService; - - public GreetController(GreetService greetService) { - this.greetService = greetService; - } - - @GetMapping("/") - public Mono greet(Mono principal) { - return principal - .map(Principal::getName) - .map(name -> String.format("Hello, %s", name)); - } - - @GetMapping("/admin") - public Mono greetAdmin(Mono principal) { - return principal - .map(Principal::getName) - .map(name -> String.format("Admin access: %s", name)); - } - - @GetMapping("/greetService") - public Mono greetService() { - return greetService.greet(); - } - -} diff --git a/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java b/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java deleted file mode 100644 index 06644fbf77..0000000000 --- a/spring-reactive/src/test/java/com/baeldung/reactive/security/SecurityIntegrationTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.reactive.security; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.test.web.reactive.server.WebTestClient; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = SpringSecurity5Application.class) -public class SecurityIntegrationTest { - - @Autowired - ApplicationContext context; - - private WebTestClient rest; - - @BeforeEach - public void setup() { - this.rest = WebTestClient.bindToApplicationContext(this.context).configureClient().build(); - } - - @Test - public void whenNoCredentials_thenRedirectToLogin() { - this.rest.get().uri("/").exchange().expectStatus().is3xxRedirection(); - } - - @Test - @WithMockUser - public void whenHasCredentials_thenSeesGreeting() { - this.rest.get().uri("/").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("Hello, user"); - } -} diff --git a/spring-remoting/README.md b/spring-remoting-modules/README.md similarity index 100% rename from spring-remoting/README.md rename to spring-remoting-modules/README.md diff --git a/spring-remoting/pom.xml b/spring-remoting-modules/pom.xml similarity index 95% rename from spring-remoting/pom.xml rename to spring-remoting-modules/pom.xml index ba76b56dbd..1981278db8 100644 --- a/spring-remoting/pom.xml +++ b/spring-remoting-modules/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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-remoting + spring-remoting-modules 1.0-SNAPSHOT spring-remoting pom diff --git a/spring-remoting/remoting-amqp/pom.xml b/spring-remoting-modules/remoting-amqp/pom.xml similarity index 90% rename from spring-remoting/remoting-amqp/pom.xml rename to spring-remoting-modules/remoting-amqp/pom.xml index 8ce70f86c2..7e1aa83cc5 100644 --- a/spring-remoting/remoting-amqp/pom.xml +++ b/spring-remoting-modules/remoting-amqp/pom.xml @@ -9,7 +9,7 @@ com.baeldung - spring-remoting + spring-remoting-modules 1.0-SNAPSHOT diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/pom.xml similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/pom.xml diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/pom.xml similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/pom.xml diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java similarity index 100% rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java diff --git a/spring-remoting/remoting-hessian-burlap/README.md b/spring-remoting-modules/remoting-hessian-burlap/README.md similarity index 100% rename from spring-remoting/remoting-hessian-burlap/README.md rename to spring-remoting-modules/remoting-hessian-burlap/README.md diff --git a/spring-remoting/remoting-hessian-burlap/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/pom.xml similarity index 100% rename from spring-remoting/remoting-hessian-burlap/pom.xml rename to spring-remoting-modules/remoting-hessian-burlap/pom.xml diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-remoting/remoting-http/README.md b/spring-remoting-modules/remoting-http/README.md similarity index 100% rename from spring-remoting/remoting-http/README.md rename to spring-remoting-modules/remoting-http/README.md diff --git a/spring-remoting/remoting-http/pom.xml b/spring-remoting-modules/remoting-http/pom.xml similarity index 91% rename from spring-remoting/remoting-http/pom.xml rename to spring-remoting-modules/remoting-http/pom.xml index 22627c638c..e085502626 100644 --- a/spring-remoting/remoting-http/pom.xml +++ b/spring-remoting-modules/remoting-http/pom.xml @@ -10,7 +10,7 @@ com.baeldung - spring-remoting + spring-remoting-modules 1.0-SNAPSHOT diff --git a/spring-remoting/remoting-http/remoting-http-api/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-api/pom.xml similarity index 100% rename from spring-remoting/remoting-http/remoting-http-api/pom.xml rename to spring-remoting-modules/remoting-http/remoting-http-api/pom.xml diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java diff --git a/spring-remoting/remoting-http/remoting-http-client/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-client/pom.xml similarity index 100% rename from spring-remoting/remoting-http/remoting-http-client/pom.xml rename to spring-remoting-modules/remoting-http/remoting-http-client/pom.xml diff --git a/spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java b/spring-remoting-modules/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java rename to spring-remoting-modules/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java diff --git a/spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-http/remoting-http-client/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-http/remoting-http-client/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-http/remoting-http-server/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-server/pom.xml similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/pom.xml rename to spring-remoting-modules/remoting-http/remoting-http-server/pom.xml diff --git a/spring-remoting/remoting-http/remoting-http-server/readme.md b/spring-remoting-modules/remoting-http/remoting-http-server/readme.md similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/readme.md rename to spring-remoting-modules/remoting-http/remoting-http-server/readme.md diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-remoting/remoting-jms/README.md b/spring-remoting-modules/remoting-jms/README.md similarity index 100% rename from spring-remoting/remoting-jms/README.md rename to spring-remoting-modules/remoting-jms/README.md diff --git a/spring-remoting/remoting-jms/pom.xml b/spring-remoting-modules/remoting-jms/pom.xml similarity index 90% rename from spring-remoting/remoting-jms/pom.xml rename to spring-remoting-modules/remoting-jms/pom.xml index 61bd1d4cfd..1f7acbb84b 100644 --- a/spring-remoting/remoting-jms/pom.xml +++ b/spring-remoting-modules/remoting-jms/pom.xml @@ -9,7 +9,7 @@ com.baeldung - spring-remoting + spring-remoting-modules 1.0-SNAPSHOT diff --git a/spring-remoting/remoting-jms/remoting-jms-client/pom.xml b/spring-remoting-modules/remoting-jms/remoting-jms-client/pom.xml similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-client/pom.xml rename to spring-remoting-modules/remoting-jms/remoting-jms-client/pom.xml diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/application.properties b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/application.properties similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/application.properties rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/application.properties diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-remoting/remoting-jms/remoting-jms-server/pom.xml b/spring-remoting-modules/remoting-jms/remoting-jms-server/pom.xml similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/pom.xml rename to spring-remoting-modules/remoting-jms/remoting-jms-server/pom.xml diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/application.properties b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/application.properties similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/application.properties rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/application.properties diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-remoting/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-remoting/remoting-rmi/README.md b/spring-remoting-modules/remoting-rmi/README.md similarity index 100% rename from spring-remoting/remoting-rmi/README.md rename to spring-remoting-modules/remoting-rmi/README.md diff --git a/spring-remoting/remoting-rmi/pom.xml b/spring-remoting-modules/remoting-rmi/pom.xml similarity index 90% rename from spring-remoting/remoting-rmi/pom.xml rename to spring-remoting-modules/remoting-rmi/pom.xml index ee65c799a4..aece04a64f 100644 --- a/spring-remoting/remoting-rmi/pom.xml +++ b/spring-remoting-modules/remoting-rmi/pom.xml @@ -9,7 +9,7 @@ com.baeldung - spring-remoting + spring-remoting-modules 1.0-SNAPSHOT diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/pom.xml similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/pom.xml diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/pom.xml similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/pom.xml diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index eb643c78c7..8d98395ab7 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -29,7 +29,7 @@ spring-security-oidc spring-security-okta spring-security-saml - spring-security-web-angular/server + spring-security-web-angular spring-security-web-boot-1 spring-security-web-boot-2 spring-security-web-boot-3 @@ -50,4 +50,4 @@ spring-security-opa - \ No newline at end of file + diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java new file mode 100644 index 0000000000..25985780ad --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java @@ -0,0 +1,13 @@ +package com.baeldung.global.exceptionhandler; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java new file mode 100644 index 0000000000..1f0a56d6bf --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java @@ -0,0 +1,25 @@ +package com.baeldung.global.exceptionhandler.controller; + +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.global.exceptionhandler.handler.RestResponse; + +@RestController +@RequestMapping +public class LoginController { + + @PostMapping(value = "/login", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity login() { + return ResponseEntity.ok(new RestResponse("Success")); + } + + @PostMapping(value = "/login-handler", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity loginWithExceptionHandler() { + return ResponseEntity.ok(new RestResponse("Success")); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java new file mode 100644 index 0000000000..b47075c941 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java @@ -0,0 +1,22 @@ +package com.baeldung.global.exceptionhandler.handler; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.AuthenticationException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@ControllerAdvice +public class DefaultExceptionHandler extends ResponseEntityExceptionHandler { + + @ExceptionHandler({ AuthenticationException.class }) + @ResponseBody + public ResponseEntity handleAuthenticationException(Exception ex) { + + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed at controller advice"); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(re); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java new file mode 100644 index 0000000000..43f1b2e883 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java @@ -0,0 +1,30 @@ +package com.baeldung.global.exceptionhandler.handler; + +public class RestError { + + String errorCode; + String errorMessage; + + public RestError(String errorCode, String errorMessage) { + super(); + this.errorCode = errorCode; + this.errorMessage = errorMessage; + } + + public String getErrorCode() { + return errorCode; + } + + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java new file mode 100644 index 0000000000..74f8082a9d --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java @@ -0,0 +1,20 @@ +package com.baeldung.global.exceptionhandler.handler; + +public class RestResponse { + + String message; + + public RestResponse(String message) { + super(); + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java new file mode 100644 index 0000000000..39e6d87c2a --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java @@ -0,0 +1,35 @@ +package com.baeldung.global.exceptionhandler.security; + +import java.io.IOException; +import java.io.OutputStream; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component("customAuthenticationEntryPoint") +public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed"); + + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + OutputStream responseStream = response.getOutputStream(); + ObjectMapper mapper = new ObjectMapper(); + mapper.writeValue(responseStream, re); + responseStream.flush(); + + } +} \ No newline at end of file diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java new file mode 100644 index 0000000000..cee3e9b62b --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java @@ -0,0 +1,58 @@ +package com.baeldung.global.exceptionhandler.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.security.web.AuthenticationEntryPoint; + +@Configuration +@EnableWebSecurity +public class CustomSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + @Qualifier("customAuthenticationEntryPoint") + AuthenticationEntryPoint authEntryPoint; + + @Bean + public UserDetailsService userDetailsService() { + UserDetails admin = User.withUsername("admin") + .password("password") + .roles("ADMIN") + .build(); + InMemoryUserDetailsManager userDetailsManager = new InMemoryUserDetailsManager(); + userDetailsManager.createUser(admin); + return userDetailsManager; + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.requestMatchers() + .antMatchers("/login") + .and() + .authorizeRequests() + .anyRequest() + .hasRole("ADMIN") + .and() + .httpBasic() + .and() + .exceptionHandling() + .authenticationEntryPoint(authEntryPoint); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication() + .withUser("admin") + .password("password") + .roles("ADMIN"); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java new file mode 100644 index 0000000000..d34ddfcdf3 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java @@ -0,0 +1,27 @@ +package com.baeldung.global.exceptionhandler.security; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerExceptionResolver; + +@Component("delegatedAuthenticationEntryPoint") +public class DelegatedAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Autowired + @Qualifier("handlerExceptionResolver") + private HandlerExceptionResolver resolver; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + resolver.resolveException(request, response, null, authException); + } +} \ No newline at end of file diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java new file mode 100644 index 0000000000..45582d3f5e --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java @@ -0,0 +1,44 @@ +package com.baeldung.global.exceptionhandler.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.AuthenticationEntryPoint; + +@Configuration +@EnableWebSecurity +@Order(101) +public class DelegatedSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + @Qualifier("delegatedAuthenticationEntryPoint") + AuthenticationEntryPoint authEntryPoint; + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.requestMatchers() + .antMatchers("/login-handler") + .and() + .authorizeRequests() + .anyRequest() + .hasRole("ADMIN") + .and() + .httpBasic() + .and() + .exceptionHandling() + .authenticationEntryPoint(authEntryPoint); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication() + .withUser("admin") + .password("password") + .roles("ADMIN"); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java new file mode 100644 index 0000000000..3346ade380 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java @@ -0,0 +1,52 @@ +package com.baeldung.global.exceptionhandler; + +import static org.hamcrest.Matchers.is; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import com.baeldung.global.exceptionhandler.controller.LoginController; +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.baeldung.global.exceptionhandler.security.CustomAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.DelegatedAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.DelegatedSecurityConfig; + +@RunWith(SpringRunner.class) +@WebMvcTest(DelegatedSecurityConfig.class) +@Import({ LoginController.class, CustomAuthenticationEntryPoint.class, DelegatedAuthenticationEntryPoint.class }) +public class DelegatedSecurityConfigUnitTest { + + @Autowired + private MockMvc mvc; + + @Test + @WithMockUser(username = "admin", roles = { "ADMIN" }) + public void whenUserAccessLogin_shouldSucceed() throws Exception { + mvc.perform(formLogin("/login-handler").user("username", "admin") + .password("password", "password") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void whenUserAccessWithWrongCredentialsWithDelegatedEntryPoint_shouldFail() throws Exception { + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed at controller advice"); + mvc.perform(formLogin("/login-handler").user("username", "admin") + .password("password", "wrong") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.errorMessage", is(re.getErrorMessage()))); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java new file mode 100644 index 0000000000..b6a0252c2c --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java @@ -0,0 +1,54 @@ +package com.baeldung.global.exceptionhandler; + +import static org.hamcrest.Matchers.is; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import com.baeldung.global.exceptionhandler.controller.LoginController; +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.baeldung.global.exceptionhandler.security.CustomAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.CustomSecurityConfig; +import com.baeldung.global.exceptionhandler.security.DelegatedAuthenticationEntryPoint; + +@RunWith(SpringRunner.class) +@WebMvcTest(CustomSecurityConfig.class) +@Import({LoginController.class, CustomAuthenticationEntryPoint.class, DelegatedAuthenticationEntryPoint.class}) +public class SecurityConfigUnitTest { + + @Autowired + private MockMvc mvc; + + @Test + @WithMockUser(username = "admin", roles = { "ADMIN" }) + public void whenUserAccessLogin_shouldSucceed() throws Exception { + mvc.perform(formLogin("/login").user("username", "admin") + .password("password", "password") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void whenUserAccessWithWrongCredentialsWithDelegatedEntryPoint_shouldFail() throws Exception { + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed"); + mvc.perform(formLogin("/login").user("username", "admin") + .password("password", "wrong") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.errorMessage", is(re.getErrorMessage()))); + } + + + +} diff --git a/spring-security-modules/spring-security-web-angular/pom.xml b/spring-security-modules/spring-security-web-angular/pom.xml new file mode 100644 index 0000000000..18d35708f6 --- /dev/null +++ b/spring-security-modules/spring-security-web-angular/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + com.baeldung.spring.security + spring-security-web-angular + spring-security-web-angular + pom + + + com.baeldung + spring-security-modules + 0.0.1-SNAPSHOT + + + + server + + + diff --git a/spring-security-modules/spring-security-web-angular/server/pom.xml b/spring-security-modules/spring-security-web-angular/server/pom.xml index 9f4f0a5caa..a1f4a9f998 100644 --- a/spring-security-modules/spring-security-web-angular/server/pom.xml +++ b/spring-security-modules/spring-security-web-angular/server/pom.xml @@ -4,16 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 server - 0.0.1-SNAPSHOT server jar Spring Security Angular - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - ../../../ + com.baeldung.spring.security + spring-security-web-angular + 0.0.1-SNAPSHOT diff --git a/spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/mongoauth/MongoAuthApplicationIntegrationTest.java b/spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/mongoauth/MongoAuthApplicationIntegrationTest.java index b7994cad9e..fc9fd1ef30 100644 --- a/spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/mongoauth/MongoAuthApplicationIntegrationTest.java +++ b/spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/mongoauth/MongoAuthApplicationIntegrationTest.java @@ -50,8 +50,8 @@ class MongoAuthApplicationIntegrationTest { setUp(); mvc = MockMvcBuilders.webAppContextSetup(context) - .apply(springSecurity()) - .build(); + .apply(springSecurity()) + .build(); } private void setUp() { @@ -85,34 +85,34 @@ class MongoAuthApplicationIntegrationTest { @Test void givenUserCredentials_whenInvokeUserAuthorizedEndPoint_thenReturn200() throws Exception { mvc.perform(get("/user").with(httpBasic(USER_NAME, PASSWORD))) - .andExpect(status().isOk()); + .andExpect(status().isOk()); } @Test void givenUserNotExists_whenInvokeEndPoint_thenReturn401() throws Exception { mvc.perform(get("/user").with(httpBasic("not_existing_user", "password"))) - .andExpect(status().isUnauthorized()); + .andExpect(status().isUnauthorized()); } @Test void givenUserExistsAndWrongPassword_whenInvokeEndPoint_thenReturn401() throws Exception { mvc.perform(get("/user").with(httpBasic(USER_NAME, "wrong_password"))) - .andExpect(status().isUnauthorized()); + .andExpect(status().isUnauthorized()); } @Test void givenUserCredentials_whenInvokeAdminAuthorizedEndPoint_thenReturn403() throws Exception { mvc.perform(get("/admin").with(httpBasic(USER_NAME, PASSWORD))) - .andExpect(status().isForbidden()); + .andExpect(status().isForbidden()); } @Test void givenAdminCredentials_whenInvokeAdminAuthorizedEndPoint_thenReturn200() throws Exception { mvc.perform(get("/admin").with(httpBasic(ADMIN_NAME, PASSWORD))) - .andExpect(status().isOk()); + .andExpect(status().isOk()); mvc.perform(get("/user").with(httpBasic(ADMIN_NAME, PASSWORD))) - .andExpect(status().isOk()); + .andExpect(status().isOk()); } } 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); - } - -} 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